Mercurial > pidgin
changeset 16387:414b9c9405fd
propagate from branch 'im.pidgin.pidgin' (head efad0dfb8f3cfbe4b837192b16689470c201d03a)
to branch 'im.pidgin.rlaager.gaim_migration' (head bfd4aafa5fc4e55af7283d4dd1b7d825cd6e9f62)
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Wed, 25 Apr 2007 00:57:53 +0000 |
| parents | e0c9a46b459f (current diff) 7f8fd78bf62b (diff) |
| children | d4c79390d424 |
| files | pidgin/gtkimhtmltoolbar.c |
| diffstat | 12 files changed, 14 insertions(+), 30 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkdialogs.c Wed Apr 25 00:56:13 2007 +0000 +++ b/pidgin/gtkdialogs.c Wed Apr 25 00:57:53 2007 +0000 @@ -285,7 +285,7 @@ context = gtk_widget_get_pango_context(widget); layout = pango_layout_new(context); - markup = g_strdup_printf("<span foreground=\"#FFFFFF\" size=\"larger\">%s</span>", VERSION); + markup = g_strdup_printf("<span foreground=\"#5c3566\">%s</span>", VERSION); pango_layout_set_font_description(layout, style->font_desc); pango_layout_set_markup(layout, markup, strlen(markup)); g_free(markup);
--- a/pidgin/gtkdocklet-x11.c Wed Apr 25 00:56:13 2007 +0000 +++ b/pidgin/gtkdocklet-x11.c Wed Apr 25 00:57:53 2007 +0000 @@ -142,9 +142,10 @@ docklet_x11_blank_icon() { if (!blank_icon) { + GtkIconSize size = GTK_ICON_SIZE_LARGE_TOOLBAR; gint width, height; - - gtk_icon_size_lookup(GTK_ICON_SIZE_LARGE_TOOLBAR, &width, &height); + g_object_get(G_OBJECT(image), "icon-size", &size, NULL); + gtk_icon_size_lookup(size, &width, &height); blank_icon = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8, width, height); gdk_pixbuf_fill(blank_icon, 0); }
--- a/pidgin/gtkimhtmltoolbar.c Wed Apr 25 00:56:13 2007 +0000 +++ b/pidgin/gtkimhtmltoolbar.c Wed Apr 25 00:57:53 2007 +0000 @@ -982,7 +982,7 @@ /* Font Face */ - button = pidgin_pixbuf_toolbar_button_from_stock(GTK_STOCK_SELECT_FONT); + button = pidgin_pixbuf_toolbar_button_from_stock(PIDGIN_STOCK_TOOLBAR_FONT_FACE); gtk_size_group_add_widget(sg, button); gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); gtk_tooltips_set_tip(toolbar->tooltips, button,
--- a/pidgin/pidginstock.c Wed Apr 25 00:56:13 2007 +0000 +++ b/pidgin/pidginstock.c Wed Apr 25 00:57:53 2007 +0000 @@ -152,6 +152,7 @@ { PIDGIN_STOCK_TOOLBAR_BLOCK, "emblems", "blocked.png", TRUE, FALSE, FALSE, FALSE, FALSE, FALSE }, { PIDGIN_STOCK_TOOLBAR_FGCOLOR, "toolbar", "change-fgcolor.png", TRUE, FALSE, FALSE, FALSE, FALSE, FALSE }, { PIDGIN_STOCK_TOOLBAR_SMILEY, "toolbar", "emote-select.png", TRUE, FALSE, FALSE, FALSE, FALSE, FALSE }, + { PIDGIN_STOCK_TOOLBAR_FONT_FACE, "toolbar", "font-face.png", TRUE, FALSE, FALSE, FALSE, FALSE, FALSE }, { PIDGIN_STOCK_TOOLBAR_TEXT_SMALLER, "toolbar", "font-size-down.png", TRUE, FALSE, FALSE, FALSE, FALSE, FALSE }, { PIDGIN_STOCK_TOOLBAR_TEXT_LARGER, "toolbar", "font-size-up.png", TRUE, FALSE, FALSE, FALSE, FALSE, FALSE }, { PIDGIN_STOCK_TOOLBAR_INSERT_IMAGE, "toolbar", "insert-image.png", TRUE, FALSE, FALSE, FALSE, FALSE, FALSE },
--- a/pidgin/pidginstock.h Wed Apr 25 00:56:13 2007 +0000 +++ b/pidgin/pidginstock.h Wed Apr 25 00:57:53 2007 +0000 @@ -113,6 +113,7 @@ #define PIDGIN_STOCK_TOOLBAR_BLOCK "pidgin-block" #define PIDGIN_STOCK_TOOLBAR_FGCOLOR "pidgin-fgcolor" #define PIDGIN_STOCK_TOOLBAR_SMILEY "pidgin-smiley" +#define PIDGIN_STOCK_TOOLBAR_FONT_FACE "pidgin-font-face" #define PIDGIN_STOCK_TOOLBAR_TEXT_SMALLER "pidgin-text-smaller" #define PIDGIN_STOCK_TOOLBAR_TEXT_LARGER "pidgin-text-larger" #define PIDGIN_STOCK_TOOLBAR_INSERT_IMAGE "pidgin-insert-image"
--- a/pidgin/pixmaps/emotes/default/22/theme Wed Apr 25 00:56:13 2007 +0000 +++ b/pidgin/pixmaps/emotes/default/22/theme Wed Apr 25 00:57:53 2007 +0000 @@ -41,32 +41,6 @@ shut-mouth.png :-X glasses-cool.png 8-) -### Following JEP 0038 -[XMPP] -smile.png :-) :) -sad.png :-( :( -wink.png ;-) ;) -crying.png :'-( :'( -angry.png >:-( >:( -good.png :yes: -bad.png :no: -#wait.png :wait: -rose.png @->-- :rose: -phone.png :telephone: -mail.png :email: -lamp.png :jabber: -cake.png :cake: -kiss.png :kiss: -love.png :heart: -love-over.png :brokenheart: -musical-note.png :music: -beer.png :beer: -coffee.png :coffee: -coins.png :money: -moon.png :moon: -sun.png :sun: -star.png :star: - ### Following Windows Live Messenger 8.1 [MSN] smile.png :) :-)
--- a/pidgin/pixmaps/toolbar/16/Makefile.am Wed Apr 25 00:56:13 2007 +0000 +++ b/pidgin/pixmaps/toolbar/16/Makefile.am Wed Apr 25 00:57:53 2007 +0000 @@ -4,6 +4,7 @@ change-bgcolor.png \ change-fgcolor.png \ emote-select.png \ + font-face.png \ font-size-down.png \ font-size-up.png \ insert-image.png \