# HG changeset patch # User Ethan Blanton # Date 1177280590 0 # Node ID c068b1fbbb75d2e3454704216ce90a0b52c36196 # Parent 03532b86c20ff42d28606dbc0efacb000d3c16a5# Parent c5a8103aa9a49c6ecd41a992da073373eb40cdf0 merge of '0367c7ba68e12f430c7443660ff965ebdd118a75' and '0e6091a497349da7fcdf1042cf96ec8e9369ee80' diff -r 03532b86c20f -r c068b1fbbb75 configure.ac --- a/configure.ac Sun Apr 22 18:20:05 2007 +0000 +++ b/configure.ac Sun Apr 22 22:23:10 2007 +0000 @@ -1953,6 +1953,8 @@ pidgin/pixmaps/toolbar/Makefile pidgin/pixmaps/toolbar/16/Makefile pidgin/pixmaps/toolbar/16/scalable/Makefile + pidgin/pixmaps/toolbar/22/Makefile + pidgin/pixmaps/toolbar/22/scalable/Makefile pidgin/pixmaps/tray/Makefile pidgin/pixmaps/tray/16/Makefile pidgin/pixmaps/tray/22/Makefile diff -r 03532b86c20f -r c068b1fbbb75 pidgin/gtkaccount.c --- a/pidgin/gtkaccount.c Sun Apr 22 18:20:05 2007 +0000 +++ b/pidgin/gtkaccount.c Sun Apr 22 22:23:10 2007 +0000 @@ -229,8 +229,8 @@ if (pixbuf == NULL) { /* Show a placeholder icon */ - GtkIconSize icon_size = gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL); - pixbuf = gtk_widget_render_icon(dialog->window, PIDGIN_STOCK_TOOLBAR_INSERT_IMAGE, + GtkIconSize icon_size = gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_SMALL); + pixbuf = gtk_widget_render_icon(dialog->window, PIDGIN_STOCK_TOOLBAR_SELECT_AVATAR, icon_size, "PidginAccount"); } diff -r 03532b86c20f -r c068b1fbbb75 pidgin/gtkstatusbox.c --- a/pidgin/gtkstatusbox.c Sun Apr 22 18:20:05 2007 +0000 +++ b/pidgin/gtkstatusbox.c Sun Apr 22 22:23:10 2007 +0000 @@ -2047,9 +2047,9 @@ if (status_box->buddy_icon == NULL) { /* Show a placeholder icon */ - GtkIconSize icon_size = gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL); + GtkIconSize icon_size = gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_SMALL); status_box->buddy_icon = gtk_widget_render_icon(GTK_WIDGET(status_box), - PIDGIN_STOCK_TOOLBAR_INSERT_IMAGE, + PIDGIN_STOCK_TOOLBAR_SELECT_AVATAR, icon_size, "PidginStatusBox"); } diff -r 03532b86c20f -r c068b1fbbb75 pidgin/pidginstock.c --- a/pidgin/pidginstock.c Sun Apr 22 18:20:05 2007 +0000 +++ b/pidgin/pidginstock.c Sun Apr 22 22:23:10 2007 +0000 @@ -161,6 +161,7 @@ { PIDGIN_STOCK_TOOLBAR_PLUGINS, "toolbar", "plugins.png", TRUE, FALSE, FALSE, FALSE, FALSE, FALSE }, { PIDGIN_STOCK_TOOLBAR_TYPING, "toolbar", "typing.png", TRUE, FALSE, FALSE, FALSE, FALSE, FALSE }, { PIDGIN_STOCK_TOOLBAR_UNBLOCK, "toolbar", "unblock.png", TRUE, FALSE, FALSE, FALSE, FALSE, FALSE }, + { PIDGIN_STOCK_TOOLBAR_SELECT_AVATAR, "toolbar", "select-avatar.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE }, { PIDGIN_STOCK_TRAY_AVAILABLE, "tray", "tray-online.png", TRUE, TRUE, FALSE, FALSE, FALSE, FALSE }, { PIDGIN_STOCK_TRAY_AWAY, "tray", "tray-away.png", TRUE, TRUE, FALSE, FALSE, FALSE, FALSE }, diff -r 03532b86c20f -r c068b1fbbb75 pidgin/pidginstock.h --- a/pidgin/pidginstock.h Sun Apr 22 18:20:05 2007 +0000 +++ b/pidgin/pidginstock.h Sun Apr 22 22:23:10 2007 +0000 @@ -123,6 +123,7 @@ #define PIDGIN_STOCK_TOOLBAR_TYPING "pidgin-typing" #define PIDGIN_STOCK_TOOLBAR_USER_INFO "pidgin-info" #define PIDGIN_STOCK_TOOLBAR_UNBLOCK "pidgin-unblock" +#define PIDGIN_STOCK_TOOLBAR_SELECT_AVATAR "pidgin-select-avatar" /* Tray icons */ #define PIDGIN_STOCK_TRAY_AVAILABLE "pidgin-tray-available" diff -r 03532b86c20f -r c068b1fbbb75 pidgin/pixmaps/toolbar/22/Makefile.am --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/toolbar/22/Makefile.am Sun Apr 22 22:23:10 2007 +0000 @@ -0,0 +1,7 @@ +SUBDIRS = scalable + +EXTRA_DIST = select-avatar.png + +pidgintoolbarpixdir = $(datadir)/pixmaps/pidgin/toolbar/22 +pidgintoolbarpix_DATA = $(EXTRA_DIST) + diff -r 03532b86c20f -r c068b1fbbb75 pidgin/pixmaps/toolbar/22/scalable/Makefile.am --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/toolbar/22/scalable/Makefile.am Sun Apr 22 22:23:10 2007 +0000 @@ -0,0 +1,1 @@ +EXTRA_DIST = select-avatar.svg diff -r 03532b86c20f -r c068b1fbbb75 pidgin/pixmaps/toolbar/22/scalable/select-avatar.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/toolbar/22/scalable/select-avatar.svg Sun Apr 22 22:23:10 2007 +0000 @@ -0,0 +1,362 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + diff -r 03532b86c20f -r c068b1fbbb75 pidgin/pixmaps/toolbar/22/select-avatar.png Binary file pidgin/pixmaps/toolbar/22/select-avatar.png has changed diff -r 03532b86c20f -r c068b1fbbb75 pidgin/pixmaps/toolbar/Makefile.am --- a/pidgin/pixmaps/toolbar/Makefile.am Sun Apr 22 18:20:05 2007 +0000 +++ b/pidgin/pixmaps/toolbar/Makefile.am Sun Apr 22 22:23:10 2007 +0000 @@ -1,1 +1,1 @@ -SUBDIRS = 16 +SUBDIRS = 16 22