pidgin.next.minor: dca1938d: Revert some changes to pidginstock.[ch] ...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: dca1938dde7d4902d6cb2dc7a59fb0c16ccd6676
Ancestor: ef75f5b709bfa7dff26b3d1186cc436f33e78b81
Author: qulogic at pidgin.im
Date: 2010-02-15T23:43:58
Branch: im.pidgin.pidgin.next.minor
URL: http://d.pidgin.im/viewmtn/revision/info/dca1938dde7d4902d6cb2dc7a59fb0c16ccd6676

Modified files:
        pidgin/pidginstock.c pidgin/pidginstock.h

ChangeLog: 

Revert some changes to pidginstock.[ch] that are no longer necessary now
that the GtkStatusIcon docklet uses icon names instead of stock names. This
should keep the ABI the same by not changing any strings in the headers.

-------------- next part --------------
============================================================
--- pidgin/pidginstock.c	5496106d21afe9514add84b06e2d09bf2d9246f1
+++ pidgin/pidginstock.c	964e1232943420c31629bbfc44adbe82a3b46baf
@@ -336,8 +336,7 @@ add_sized_icon(GtkIconSet *iconset, GtkI
 
 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 +353,7 @@ add_sized_icon(GtkIconSet *iconset, GtkI
 	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 +363,7 @@ add_sized_icon(GtkIconSet *iconset, GtkI
 		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 +383,7 @@ add_sized_icon(GtkIconSet *iconset, GtkI
 		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 +439,9 @@ pidgin_stock_load_status_icon_theme(Pidg
 
 #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,9 +468,9 @@ pidgin_stock_load_status_icon_theme(Pidg
 
 #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");
@@ -561,7 +560,7 @@ pidgin_stock_load_stock_icon_theme(Pidgi
 
 #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");
============================================================
--- pidgin/pidginstock.h	7ebe73500c08decce9d35ffe65ae5d854f5eab87
+++ pidgin/pidginstock.h	9a5308fdb991f569f3c498f131fe107538d792c2
@@ -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"