changeset 16752:94ee22ed492b

And make them used
author Sean Egan <seanegan@gmail.com>
date Tue, 01 May 2007 21:43:51 +0000
parents bc9219a40623
children c3e5250795ab
files pidgin/gtkdocklet-x11.c pidgin/gtkdocklet.c pidgin/gtkdocklet.h pidgin/pidginstock.c pidgin/pidginstock.h pidgin/pixmaps/tray/16/Makefile.am pidgin/win32/gtkdocklet-win32.c pidgin/win32/pidgin_dll_rc.rc.in pidgin/win32/resource.h
diffstat 9 files changed, 16 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/pidgin/gtkdocklet-x11.c	Tue May 01 19:59:11 2007 +0000
+++ b/pidgin/gtkdocklet-x11.c	Tue May 01 21:43:51 2007 +0000
@@ -118,6 +118,9 @@
 		case DOCKLET_STATUS_XA:
 			icon_name = PIDGIN_STOCK_TRAY_XA;
 			break;
+		case DOCKLET_STATUS_INVISIBLE:
+			icon_name = PIDGIN_STOCK_TRAY_INVISIBLE;
+			break;
 	}
 
 	if(icon_name) {
--- a/pidgin/gtkdocklet.c	Tue May 01 19:59:11 2007 +0000
+++ b/pidgin/gtkdocklet.c	Tue May 01 21:43:51 2007 +0000
@@ -206,6 +206,8 @@
 		newstatus = DOCKLET_STATUS_XA;
 	else if (prim == PURPLE_STATUS_OFFLINE)
 		newstatus = DOCKLET_STATUS_OFFLINE;
+	else if (prim == PURPLE_STATUS_INVISIBLE)
+		newstatus = DOCKLET_STATUS_INVISIBLE;
 	else
 		newstatus = DOCKLET_STATUS_AVAILABLE;
 
--- a/pidgin/gtkdocklet.h	Tue May 01 19:59:11 2007 +0000
+++ b/pidgin/gtkdocklet.h	Tue May 01 21:43:51 2007 +0000
@@ -29,6 +29,7 @@
 {
 	DOCKLET_STATUS_OFFLINE,
 	DOCKLET_STATUS_AVAILABLE,
+	DOCKLET_STATUS_INVISIBLE,
 	DOCKLET_STATUS_PENDING,
 	DOCKLET_STATUS_AWAY,
 	DOCKLET_STATUS_BUSY,
--- a/pidgin/pidginstock.c	Tue May 01 19:59:11 2007 +0000
+++ b/pidgin/pidginstock.c	Tue May 01 21:43:51 2007 +0000
@@ -162,6 +162,7 @@
 	{ PIDGIN_STOCK_TOOLBAR_SELECT_AVATAR, "toolbar", "select-avatar.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, NULL  },
 
 	{ PIDGIN_STOCK_TRAY_AVAILABLE, "tray", "tray-online.png", TRUE, TRUE, FALSE, FALSE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_TRAY_INVISIBLE, "tray", "tray-invisible.png", TRUE, TRUE, FALSE, FALSE, FALSE, FALSE, NULL  },
 	{ PIDGIN_STOCK_TRAY_AWAY, "tray", "tray-away.png", TRUE, TRUE, FALSE, FALSE, FALSE, FALSE, NULL  },
 	{ PIDGIN_STOCK_TRAY_BUSY, "tray", "tray-busy.png", TRUE, TRUE, FALSE, FALSE, FALSE, FALSE, NULL  },
 	{ PIDGIN_STOCK_TRAY_XA, "tray", "tray-extended-away.png", TRUE, TRUE, FALSE, FALSE, FALSE, FALSE, NULL  },
--- a/pidgin/pidginstock.h	Tue May 01 19:59:11 2007 +0000
+++ b/pidgin/pidginstock.h	Tue May 01 21:43:51 2007 +0000
@@ -128,6 +128,7 @@
 
 /* Tray icons */
 #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"
 #define PIDGIN_STOCK_TRAY_XA              "pidgin-tray-xa"
--- a/pidgin/pixmaps/tray/16/Makefile.am	Tue May 01 19:59:11 2007 +0000
+++ b/pidgin/pixmaps/tray/16/Makefile.am	Tue May 01 21:43:51 2007 +0000
@@ -15,7 +15,8 @@
 	connecting_4bit.ico \
 	extended-away_4bit.ico \
 	message_4bit.ico \
-	offline_4bit.ico
+	offline_4bit.ico \
+	invisible_4bit.ico
 
 pidgintraypixdir = $(datadir)/pixmaps/pidgin/tray/16
 pidgintraypix_DATA = $(TRAY_ICONS)
--- a/pidgin/win32/gtkdocklet-win32.c	Tue May 01 19:59:11 2007 +0000
+++ b/pidgin/win32/gtkdocklet-win32.c	Tue May 01 21:43:51 2007 +0000
@@ -496,6 +496,8 @@
 		case DOCKLET_STATUS_XA:
 			icon_name = PIDGIN_STOCK_TRAY_XA;
 			break;
+		case DOCKLET_STATUS_INVISIBLE:
+			icon_name = PIDGIN_STOCK_TRAY_INVISIBLE;
 		}
 
 		g_return_if_fail(icon_name != NULL);
@@ -569,6 +571,8 @@
 			MAKEINTRESOURCE(PIDGIN_TRAY_CONNECTING_4BIT), IMAGE_ICON, 16, 16, LR_CREATEDIBSECTION);
 		cached_icons[DOCKLET_STATUS_PENDING] = (HICON) LoadImage(winpidgin_dll_hinstance(),
 			MAKEINTRESOURCE(PIDGIN_TRAY_PENDING_4BIT), IMAGE_ICON, 16, 16, LR_CREATEDIBSECTION);
+		cached_icons[DOCKLET_STATUS_INVISIBLE] = (HICON) LoadImage(winpidgin_dll_hinstance(),
+			MAKEINTRESOURCE(PIDGIN_TRAY_INVISIBLE_4BIT), IMAGE_ICON, 16, 16, LR_CREATEDIBSECTION);
 	}
 
 	/* Create icon in systray */
--- a/pidgin/win32/pidgin_dll_rc.rc.in	Tue May 01 19:59:11 2007 +0000
+++ b/pidgin/win32/pidgin_dll_rc.rc.in	Tue May 01 21:43:51 2007 +0000
@@ -40,3 +40,4 @@
 PIDGIN_TRAY_OFFLINE_4BIT	ICON PIXMAPDIR "offline_4bit.ico"
 PIDGIN_TRAY_CONNECTING_4BIT	ICON PIXMAPDIR "connecting_4bit.ico"
 PIDGIN_TRAY_PENDING_4BIT	ICON PIXMAPDIR "message_4bit.ico"
+PIDGIN_TRAY_INVISIBLE_4BIT	ICON PIXMAPDIR "invisible_4bit.ico"
--- a/pidgin/win32/resource.h	Tue May 01 19:59:11 2007 +0000
+++ b/pidgin/win32/resource.h	Tue May 01 21:43:51 2007 +0000
@@ -6,3 +6,4 @@
 #define PIDGIN_TRAY_OFFLINE_4BIT	109
 #define PIDGIN_TRAY_CONNECTING_4BIT	110
 #define PIDGIN_TRAY_PENDING_4BIT	111
+#define PIDGIN_TRAY_INVISIBLE_4BIT      112