Mercurial > pidgin.yaz

changeset 15699:1229a0cd9126

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
docklet pending status
author Sean Egan <seanegan@gmail.com>
date Sun, 25 Feb 2007 09:07:43 +0000
parents 43c7071878de
children 074ac986fae0
files pidgin/gaimstock.c pidgin/gaimstock.h pidgin/gtkconv.c pidgin/gtkdocklet.c pidgin/pixmaps/emblems/16/Makefile.am pidgin/pixmaps/emblems/16/half-operator.png pidgin/pixmaps/emblems/16/operator.png pidgin/pixmaps/status/16/Makefile.am pidgin/pixmaps/status/16/half-operator.png pidgin/pixmaps/status/16/operator.png pidgin/pixmaps/status/16/voice.png
diffstat 11 files changed, 20 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/pidgin/gaimstock.c	Sun Feb 25 03:22:37 2007 +0000
+++ b/pidgin/gaimstock.c	Sun Feb 25 09:07:43 2007 +0000
@@ -120,10 +120,13 @@
 	{ PIDGIN_STOCK_STATUS_LOGOUT, 	"status", "log-out.png",	TRUE, TRUE, TRUE, FALSE },
 	{ PIDGIN_STOCK_STATUS_OFFLINE, 	"status", "offline.png",	TRUE, TRUE, TRUE, FALSE },
 	{ PIDGIN_STOCK_STATUS_PERSON, 	"status", "person.png",		TRUE, TRUE, TRUE, FALSE },
-	{ PIDGIN_STOCK_STATUS_OPERATOR,	"status", "operator.png",	TRUE, FALSE, FALSE, FALSE },
-	{ PIDGIN_STOCK_STATUS_HALFOP, 	"status", "half-operator.png",	TRUE, FALSE, FALSE, FALSE },
-	{ PIDGIN_STOCK_STATUS_VOICE, 	"status", "voice.png",		TRUE, FALSE, FALSE, FALSE },
 	{ PIDGIN_STOCK_STATUS_MESSAGE, 	"status", "message-pending.png",TRUE, FALSE, FALSE, FALSE },
+	
+	{ PIDGIN_STOCK_STATUS_IGNORED,	"emblems", "blocked.png",	TRUE, FALSE, FALSE, FALSE },
+	{ PIDGIN_STOCK_STATUS_FOUNDER,	"emblems", "founder.png",	TRUE, FALSE, FALSE, FALSE },
+	{ PIDGIN_STOCK_STATUS_OPERATOR,	"emblems", "operator.png",	TRUE, FALSE, FALSE, FALSE },
+	{ PIDGIN_STOCK_STATUS_HALFOP, 	"emblems", "half-operator.png",	TRUE, FALSE, FALSE, FALSE },
+	{ PIDGIN_STOCK_STATUS_VOICE, 	"emblems", "voice.png",		TRUE, FALSE, FALSE, FALSE },
 
 	{ PIDGIN_STOCK_DIALOG_AUTH,	"dialogs", "auth.png",		TRUE, FALSE, FALSE, TRUE },
 	{ PIDGIN_STOCK_DIALOG_COOL,	"dialogs", "cool.png", 		FALSE, FALSE, FALSE, TRUE },
@@ -166,7 +169,7 @@
 	{ PIDGIN_STOCK_TRAY_BUSY, "tray", "tray-busy.png", TRUE, FALSE, FALSE, FALSE },
 	{ PIDGIN_STOCK_TRAY_XA, "tray", "tray-extended-away.png", TRUE, FALSE, FALSE, FALSE },
 	{ PIDGIN_STOCK_TRAY_OFFLINE, "tray", "tray-offline.png", TRUE, FALSE, FALSE, FALSE },
-	{ PIDGIN_STOCK_TRAY_CONNECT, "tray", "tray-online.png", TRUE, FALSE, FALSE, FALSE },
+	{ PIDGIN_STOCK_TRAY_CONNECT, "tray", "tray-connecting.png", TRUE, FALSE, FALSE, FALSE },
 	{ PIDGIN_STOCK_TRAY_PENDING, "tray", "tray-message.png", TRUE, FALSE, FALSE, FALSE }
 };
 
--- a/pidgin/gaimstock.h	Sun Feb 25 03:22:37 2007 +0000
+++ b/pidgin/gaimstock.h	Sun Feb 25 09:07:43 2007 +0000
@@ -75,10 +75,14 @@
 #define PIDGIN_STOCK_STATUS_LOGOUT     "pidgin-status-logout"
 #define PIDGIN_STOCK_STATUS_OFFLINE    "pidgin-status-offline"
 #define PIDGIN_STOCK_STATUS_PERSON     "pidgin-status-person"
+#define PIDGIN_STOCK_STATUS_MESSAGE    "pidgin-status-message"
+
+/* Chat room emblems */
+#define PIDGIN_STOCK_STATUS_IGNORED    "pidgin-status-ignored"
+#define PIDGIN_STOCK_STATUS_FOUNDER    "pidgin-status-founder"
 #define PIDGIN_STOCK_STATUS_OPERATOR   "pidgin-status-operator"
 #define PIDGIN_STOCK_STATUS_HALFOP     "pidgin-status-halfop"
 #define PIDGIN_STOCK_STATUS_VOICE      "pidgin-status-voice"
-#define PIDGIN_STOCK_STATUS_MESSAGE    "pidgin-status-message"
 
 /* Dialog icons */
 #define PIDGIN_STOCK_DIALOG_AUTH	"pidgin-dialog-auth"
--- a/pidgin/gtkconv.c	Sun Feb 25 03:22:37 2007 +0000
+++ b/pidgin/gtkconv.c	Sun Feb 25 09:07:43 2007 +0000
@@ -3344,7 +3344,7 @@
 	const char *image = NULL;
 
 	if (flags & GAIM_CBFLAGS_FOUNDER) {
-		image = "founder.png";
+		image = PIDGIN_STOCK_STATUS_FOUNDER;
 	} else if (flags & GAIM_CBFLAGS_OP) {
 		image = PIDGIN_STOCK_STATUS_OPERATOR;
 	} else if (flags & GAIM_CBFLAGS_HALFOP) {
@@ -3352,7 +3352,7 @@
 	} else if (flags & GAIM_CBFLAGS_VOICE) {
 		image = PIDGIN_STOCK_STATUS_VOICE;
 	} else if ((!flags) && gaim_conv_chat_is_user_ignored(chat, name)) {
-		image = "ignored.png";
+		image = PIDGIN_STOCK_STATUS_IGNORED;
 	} else {
 		return NULL;
 	}
--- a/pidgin/gtkdocklet.c	Sun Feb 25 03:22:37 2007 +0000
+++ b/pidgin/gtkdocklet.c	Sun Feb 25 09:07:43 2007 +0000
@@ -189,8 +189,9 @@
 	
 	saved_status = gaim_savedstatus_get_current();
         prim = gaim_savedstatus_get_type(saved_status);
-	
-	if (connecting)
+	if (pending)
+		newstatus = DOCKLET_STATUS_PENDING;	
+	else if (connecting)
 		newstatus = DOCKLET_STATUS_CONNECTING;
 	else if (prim == GAIM_STATUS_UNAVAILABLE)
 		newstatus = DOCKLET_STATUS_BUSY;
--- a/pidgin/pixmaps/emblems/16/Makefile.am	Sun Feb 25 03:22:37 2007 +0000
+++ b/pidgin/pixmaps/emblems/16/Makefile.am	Sun Feb 25 09:07:43 2007 +0000
@@ -8,9 +8,11 @@
 		founder.png \
 		free-for-chat.png \
 		game.png \
+		half-operator.png \
 		male.png \
 		mobile.png \
 		not-authorized.png \
+		operator.png \
 		qq-member.png \
 		secure.png \
 		unavailable.png \
Binary file pidgin/pixmaps/emblems/16/half-operator.png has changed
Binary file pidgin/pixmaps/emblems/16/operator.png has changed
--- a/pidgin/pixmaps/status/16/Makefile.am	Sun Feb 25 03:22:37 2007 +0000
+++ b/pidgin/pixmaps/status/16/Makefile.am	Sun Feb 25 09:07:43 2007 +0000
@@ -9,14 +9,11 @@
 		chat.png \
 		extended-away.png \
 		extended-away_i.png \
-		half-operator.png \
 		log-in.png \
 		log-out.png \
 		message-pending.png \
 		offline.png \
-		operator.png \
-		person.png \
-		voice.png
+		person.png 
 
 pidginstatuspixdir = $(datadir)/pixmaps/pidgin/status/16
 
Binary file pidgin/pixmaps/status/16/half-operator.png has changed
Binary file pidgin/pixmaps/status/16/operator.png has changed
Binary file pidgin/pixmaps/status/16/voice.png has changed