changeset 29371:667806b1f359

merge of '064d2d1b2f96be3cfdc5d15af37aaa8e16150904' and 'f3a92f1db9439e0bedbcfc479c179d0bf4047b72'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Tue, 16 Feb 2010 00:50:34 +0000
parents ecd1aa92fd57 (current diff) b18e2121be6f (diff)
children 529233281dfe 4608d460024e
files pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-connecting.png pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-extended-away.png pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-message.png pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-new-im.png pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-online.png pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-connecting.png pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-extended-away.png pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-message.png pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-new-im.png pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-online.png pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-connecting.png pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-extended-away.png pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-message.png pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-new-im.png pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-online.png pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-connecting.png pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-extended-away.png pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-message.png pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-new-im.png pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-online.png
diffstat 45 files changed, 53 insertions(+), 58 deletions(-) [+]
line wrap: on
line diff
--- a/pidgin/gtkdocklet-gtk.c	Mon Feb 15 22:32:33 2010 +0000
+++ b/pidgin/gtkdocklet-gtk.c	Tue Feb 16 00:50:34 2010 +0000
@@ -34,16 +34,12 @@
 static void
 docklet_gtk_status_activated_cb(GtkStatusIcon *status_icon, gpointer user_data)
 {
-	purple_debug_info("docklet", "button clicked %d\n", 1);
-
 	pidgin_docklet_clicked(1); 
 }
 
 static void
 docklet_gtk_status_clicked_cb(GtkStatusIcon *status_icon, guint button, guint activate_time, gpointer user_data)
 {
-	purple_debug_info("docklet", "button clicked %d\n", button);
-
 	pidgin_docklet_clicked(button); 
 }
 
@@ -111,7 +107,7 @@
 	g_object_unref(G_OBJECT(docklet));
 	docklet = NULL;
 
-	purple_debug_info("docklet", "destroyed\n");
+	purple_debug_info("docklet", "GTK+ destroyed\n");
 }
 
 static void
@@ -133,7 +129,7 @@
 
 	pidgin_docklet_embedded();
 	gtk_status_icon_set_visible(docklet, TRUE);
-	purple_debug_info("docklet", "created\n");
+	purple_debug_info("docklet", "GTK+ created\n");
 }
 
 static void
--- a/pidgin/gtkdocklet-x11.c	Mon Feb 15 22:32:33 2010 +0000
+++ b/pidgin/gtkdocklet-x11.c	Tue Feb 16 00:50:34 2010 +0000
@@ -61,7 +61,7 @@
 static void
 docklet_x11_embedded_cb(GtkWidget *widget, void *data)
 {
-	purple_debug(PURPLE_DEBUG_INFO, "docklet", "embedded\n");
+	purple_debug(PURPLE_DEBUG_INFO, "docklet", "X11 embedded\n");
 
 	g_source_remove(embed_timeout);
 	embed_timeout = 0;
@@ -72,7 +72,7 @@
 static void
 docklet_x11_destroyed_cb(GtkWidget *widget, void *data)
 {
-	purple_debug(PURPLE_DEBUG_INFO, "docklet", "destroyed\n");
+	purple_debug(PURPLE_DEBUG_INFO, "docklet", "X11 destroyed\n");
 
 	pidgin_docklet_remove();
 
@@ -254,7 +254,7 @@
 
 	image = NULL;
 
-	purple_debug(PURPLE_DEBUG_INFO, "docklet", "destroyed\n");
+	purple_debug(PURPLE_DEBUG_INFO, "docklet", "X11 destroyed\n");
 }
 
 static gboolean
@@ -265,7 +265,7 @@
 	 * loaded so that it can embed automatically if/when a notification
 	 * area becomes available.
 	 */
-	purple_debug_info("docklet", "failed to embed within timeout\n");
+	purple_debug_info("docklet", "X11 failed to embed within timeout\n");
 	pidgin_docklet_remove();
 
 	return FALSE;
@@ -328,7 +328,7 @@
 		}
 	}
 
-	purple_debug(PURPLE_DEBUG_INFO, "docklet", "created\n");
+	purple_debug(PURPLE_DEBUG_INFO, "docklet", "X11 created\n");
 }
 
 static void
--- a/pidgin/pidginstock.c	Mon Feb 15 22:32:33 2010 +0000
+++ b/pidgin/pidginstock.c	Tue Feb 16 00:50:34 2010 +0000
@@ -203,16 +203,18 @@
 };
 
 const SizedStockIcon sized_tray_icons [] = {
-
-	{ PIDGIN_STOCK_TRAY_AVAILABLE, "tray", "tray-online.png",        FALSE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL },
-	{ PIDGIN_STOCK_TRAY_INVISIBLE, "tray", "tray-invisible.png",     FALSE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL },
-	{ PIDGIN_STOCK_TRAY_AWAY,      "tray", "tray-away.png",          FALSE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL },
-	{ PIDGIN_STOCK_TRAY_BUSY,      "tray", "tray-busy.png",          FALSE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL },
-	{ PIDGIN_STOCK_TRAY_XA,        "tray", "tray-extended-away.png", FALSE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL },
-	{ PIDGIN_STOCK_TRAY_OFFLINE,   "tray", "tray-offline.png",       FALSE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL },
-	{ PIDGIN_STOCK_TRAY_CONNECT,   "tray", "tray-connecting.png",    FALSE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL },
-	{ PIDGIN_STOCK_TRAY_PENDING,   "tray", "tray-new-im.png",        FALSE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL },
-	{ PIDGIN_STOCK_TRAY_EMAIL,     "tray", "tray-message.png",       FALSE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL }
+#define SIZED_TRAY_ICON(name) \
+	{ name, "tray/hicolor", "status/" name ".png", FALSE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL }
+	SIZED_TRAY_ICON( PIDGIN_STOCK_TRAY_AVAILABLE ),
+	SIZED_TRAY_ICON( PIDGIN_STOCK_TRAY_INVISIBLE ),
+	SIZED_TRAY_ICON( PIDGIN_STOCK_TRAY_AWAY ),
+	SIZED_TRAY_ICON( PIDGIN_STOCK_TRAY_BUSY ),
+	SIZED_TRAY_ICON( PIDGIN_STOCK_TRAY_XA ),
+	SIZED_TRAY_ICON( PIDGIN_STOCK_TRAY_OFFLINE ),
+	SIZED_TRAY_ICON( PIDGIN_STOCK_TRAY_CONNECT ),
+	SIZED_TRAY_ICON( PIDGIN_STOCK_TRAY_PENDING ),
+	SIZED_TRAY_ICON( PIDGIN_STOCK_TRAY_EMAIL )
+#undef SIZED_TRAY_ICON
 };
 
 /*****************************************************************************
@@ -336,8 +338,7 @@
 
 static void
 add_sized_icon(GtkIconSet *iconset, GtkIconSize sizeid, PidginIconTheme *theme,
-		const char *size, SizedStockIcon sized_icon, gboolean translucent,
-		gboolean size_wildcarded)
+		const char *size, SizedStockIcon sized_icon, gboolean translucent)
 {
 	char *filename;
 	GtkIconSource *source;
@@ -354,7 +355,7 @@
 	gtk_icon_source_set_direction(source, GTK_TEXT_DIR_LTR);
 	gtk_icon_source_set_direction_wildcarded(source, !sized_icon.rtl);
 	gtk_icon_source_set_size(source, sizeid);
-	gtk_icon_source_set_size_wildcarded(source, size_wildcarded);
+	gtk_icon_source_set_size_wildcarded(source, FALSE);
 	gtk_icon_source_set_state_wildcarded(source, TRUE);
 	gtk_icon_set_add_source(iconset, source);
 	gtk_icon_source_free(source);
@@ -364,7 +365,7 @@
 		gtk_icon_source_set_pixbuf(source, pixbuf);
 		gtk_icon_source_set_direction_wildcarded(source, TRUE);
 		gtk_icon_source_set_size(source, GTK_ICON_SIZE_MENU);
-		gtk_icon_source_set_size_wildcarded(source, size_wildcarded);
+		gtk_icon_source_set_size_wildcarded(source, FALSE);
 		gtk_icon_source_set_state_wildcarded(source, TRUE);
 		gtk_icon_set_add_source(iconset, source);
 		gtk_icon_source_free(source);
@@ -384,7 +385,7 @@
 		gtk_icon_source_set_filename(source, filename);
 		gtk_icon_source_set_direction(source, GTK_TEXT_DIR_RTL);
 		gtk_icon_source_set_size(source, sizeid);
-		gtk_icon_source_set_size_wildcarded(source, size_wildcarded);
+		gtk_icon_source_set_size_wildcarded(source, FALSE);
 		gtk_icon_source_set_state_wildcarded(source, TRUE);
 		gtk_icon_set_add_source(iconset, source);
 		g_free(filename);
@@ -440,9 +441,9 @@
 
 #define ADD_SIZED_ICON(name, size) \
 		if (sized_status_icons[i].name) { \
-			add_sized_icon(normal, name, PIDGIN_ICON_THEME(theme), size, sized_status_icons[i], FALSE, FALSE); \
+			add_sized_icon(normal, name, PIDGIN_ICON_THEME(theme), size, sized_status_icons[i], FALSE); \
 			if (sized_status_icons[i].translucent_name) \
-				add_sized_icon(translucent, name, PIDGIN_ICON_THEME(theme), size, sized_status_icons[i], TRUE, FALSE); \
+				add_sized_icon(translucent, name, PIDGIN_ICON_THEME(theme), size, sized_status_icons[i], TRUE); \
 		}
 		ADD_SIZED_ICON(microscopic, "11");
 		ADD_SIZED_ICON(extra_small, "16");
@@ -469,16 +470,14 @@
 
 #define ADD_SIZED_ICON(name, size) \
 		if (sized_tray_icons[i].name) { \
-			add_sized_icon(normal, name, PIDGIN_ICON_THEME(theme), size, sized_tray_icons[i], FALSE, TRUE); \
+			add_sized_icon(normal, name, PIDGIN_ICON_THEME(theme), size, sized_tray_icons[i], FALSE); \
 			if (sized_tray_icons[i].translucent_name) \
-				add_sized_icon(translucent, name, PIDGIN_ICON_THEME(theme), size, sized_tray_icons[i], TRUE, TRUE); \
+				add_sized_icon(translucent, name, PIDGIN_ICON_THEME(theme), size, sized_tray_icons[i], TRUE); \
 		}
-		ADD_SIZED_ICON(microscopic, "11");
-		ADD_SIZED_ICON(extra_small, "16");
-		ADD_SIZED_ICON(small, "22");
-		ADD_SIZED_ICON(medium, "32");
-		ADD_SIZED_ICON(large, "48");
-		ADD_SIZED_ICON(huge, "64");
+		ADD_SIZED_ICON(extra_small, "16x16");
+		ADD_SIZED_ICON(small, "22x22");
+		ADD_SIZED_ICON(medium, "32x32");
+		ADD_SIZED_ICON(large, "48x48");
 #undef ADD_SIZED_ICON
 
 		gtk_icon_factory_add(icon_factory, sized_tray_icons[i].name, normal);
@@ -561,7 +560,7 @@
 
 #define ADD_SIZED_ICON(name, size) \
 		if (sized_stock_icons[i].name) \
-			add_sized_icon(iconset, name, PIDGIN_ICON_THEME(theme), size, sized_stock_icons[i], FALSE, FALSE);
+			add_sized_icon(iconset, name, PIDGIN_ICON_THEME(theme), size, sized_stock_icons[i], FALSE);
 		ADD_SIZED_ICON(microscopic, "11");
 		ADD_SIZED_ICON(extra_small, "16");
 		ADD_SIZED_ICON(small, "22");
--- a/pidgin/pidginstock.h	Mon Feb 15 22:32:33 2010 +0000
+++ b/pidgin/pidginstock.h	Tue Feb 16 00:50:34 2010 +0000
@@ -162,7 +162,7 @@
 #define PIDGIN_STOCK_TOOLBAR_SEND_ATTENTION	"pidgin-send-attention"
 
 /* Tray icons */
-#define PIDGIN_STOCK_TRAY_AVAILABLE       "pidgin-tray-online"
+#define PIDGIN_STOCK_TRAY_AVAILABLE       "pidgin-tray-available"
 #define PIDGIN_STOCK_TRAY_INVISIBLE	  "pidgin-tray-invisible"
 #define PIDGIN_STOCK_TRAY_AWAY	  	  "pidgin-tray-away"
 #define PIDGIN_STOCK_TRAY_BUSY            "pidgin-tray-busy"
--- a/pidgin/pixmaps/Makefile.am	Mon Feb 15 22:32:33 2010 +0000
+++ b/pidgin/pixmaps/Makefile.am	Tue Feb 16 00:50:34 2010 +0000
@@ -489,45 +489,45 @@
 		tray/hicolor/16x16/status/pidgin-tray-away.png \
 		tray/hicolor/16x16/status/pidgin-tray-busy.png \
 		tray/hicolor/16x16/status/pidgin-tray-invisible.png \
-		tray/hicolor/16x16/status/pidgin-tray-connecting.png \
-		tray/hicolor/16x16/status/pidgin-tray-extended-away.png \
-		tray/hicolor/16x16/status/pidgin-tray-message.png \
-		tray/hicolor/16x16/status/pidgin-tray-new-im.png \
+		tray/hicolor/16x16/status/pidgin-tray-connect.png \
+		tray/hicolor/16x16/status/pidgin-tray-xa.png \
+		tray/hicolor/16x16/status/pidgin-tray-email.png \
+		tray/hicolor/16x16/status/pidgin-tray-pending.png \
 		tray/hicolor/16x16/status/pidgin-tray-offline.png \
-		tray/hicolor/16x16/status/pidgin-tray-online.png
+		tray/hicolor/16x16/status/pidgin-tray-available.png
 
 TRAY_22 = \
 		tray/hicolor/22x22/status/pidgin-tray-away.png \
 		tray/hicolor/22x22/status/pidgin-tray-busy.png \
-		tray/hicolor/22x22/status/pidgin-tray-connecting.png \
-		tray/hicolor/22x22/status/pidgin-tray-extended-away.png \
+		tray/hicolor/22x22/status/pidgin-tray-connect.png \
+		tray/hicolor/22x22/status/pidgin-tray-xa.png \
 		tray/hicolor/22x22/status/pidgin-tray-invisible.png \
-		tray/hicolor/22x22/status/pidgin-tray-message.png \
-		tray/hicolor/22x22/status/pidgin-tray-new-im.png \
+		tray/hicolor/22x22/status/pidgin-tray-email.png \
+		tray/hicolor/22x22/status/pidgin-tray-pending.png \
 		tray/hicolor/22x22/status/pidgin-tray-offline.png \
-		tray/hicolor/22x22/status/pidgin-tray-online.png
+		tray/hicolor/22x22/status/pidgin-tray-available.png
 
 TRAY_32 = \
 		tray/hicolor/32x32/status/pidgin-tray-away.png \
 		tray/hicolor/32x32/status/pidgin-tray-busy.png \
-		tray/hicolor/32x32/status/pidgin-tray-connecting.png \
-		tray/hicolor/32x32/status/pidgin-tray-extended-away.png \
+		tray/hicolor/32x32/status/pidgin-tray-connect.png \
+		tray/hicolor/32x32/status/pidgin-tray-xa.png \
 		tray/hicolor/32x32/status/pidgin-tray-invisible.png \
-		tray/hicolor/32x32/status/pidgin-tray-message.png \
-		tray/hicolor/32x32/status/pidgin-tray-new-im.png \
+		tray/hicolor/32x32/status/pidgin-tray-email.png \
+		tray/hicolor/32x32/status/pidgin-tray-pending.png \
 		tray/hicolor/32x32/status/pidgin-tray-offline.png \
-		tray/hicolor/32x32/status/pidgin-tray-online.png
+		tray/hicolor/32x32/status/pidgin-tray-available.png
 
 TRAY_48 = \
 		tray/hicolor/48x48/status/pidgin-tray-away.png \
 		tray/hicolor/48x48/status/pidgin-tray-busy.png \
-		tray/hicolor/48x48/status/pidgin-tray-connecting.png \
-		tray/hicolor/48x48/status/pidgin-tray-extended-away.png \
+		tray/hicolor/48x48/status/pidgin-tray-connect.png \
+		tray/hicolor/48x48/status/pidgin-tray-xa.png \
 		tray/hicolor/48x48/status/pidgin-tray-invisible.png \
-		tray/hicolor/48x48/status/pidgin-tray-message.png \
-		tray/hicolor/48x48/status/pidgin-tray-new-im.png \
+		tray/hicolor/48x48/status/pidgin-tray-email.png \
+		tray/hicolor/48x48/status/pidgin-tray-pending.png \
 		tray/hicolor/48x48/status/pidgin-tray-offline.png \
-		tray/hicolor/48x48/status/pidgin-tray-online.png
+		tray/hicolor/48x48/status/pidgin-tray-available.png
 
 EXTRA_DIST = \
 		edit.png			\
Binary file pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-available.png has changed
Binary file pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-connect.png has changed
Binary file pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-connecting.png has changed
Binary file pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-email.png has changed
Binary file pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-extended-away.png has changed
Binary file pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-message.png has changed
Binary file pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-new-im.png has changed
Binary file pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-online.png has changed
Binary file pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-pending.png has changed
Binary file pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-xa.png has changed
Binary file pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-available.png has changed
Binary file pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-connect.png has changed
Binary file pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-connecting.png has changed
Binary file pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-email.png has changed
Binary file pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-extended-away.png has changed
Binary file pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-message.png has changed
Binary file pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-new-im.png has changed
Binary file pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-online.png has changed
Binary file pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-pending.png has changed
Binary file pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-xa.png has changed
Binary file pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-available.png has changed
Binary file pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-connect.png has changed
Binary file pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-connecting.png has changed
Binary file pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-email.png has changed
Binary file pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-extended-away.png has changed
Binary file pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-message.png has changed
Binary file pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-new-im.png has changed
Binary file pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-online.png has changed
Binary file pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-pending.png has changed
Binary file pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-xa.png has changed
Binary file pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-available.png has changed
Binary file pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-connect.png has changed
Binary file pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-connecting.png has changed
Binary file pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-email.png has changed
Binary file pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-extended-away.png has changed
Binary file pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-message.png has changed
Binary file pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-new-im.png has changed
Binary file pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-online.png has changed
Binary file pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-pending.png has changed
Binary file pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-xa.png has changed