[ekg2-commit] ekg2: Makefile.am (HEAD) palette.c (HEAD) palette.h (HEAD) userlistgui.c (HEAD) [peres]

[CVS commit]

Module name:	ekg2
Changes by:	peres	2007-08-27 00:59:50

Modified files:
	Makefile.am palette.c palette.h userlistgui.c

Log message:
Icons for error & unknown statuses. Change way of choosing icons to direct
enum-switch. Dj, if that's not what you wanted, sorry.

Index: Makefile.am
===================================================================
RCS file: /home/cvs/ekg2/plugins/gtk/Makefile.am,v
diff -d -u -r1.13 -r1.14
--- Makefile.am	21 Aug 2007 14:56:29 -0000	1.13
+++ Makefile.am	26 Aug 2007 22:59:50 -0000	1.14
@@ -1,5 +1,5 @@
 GG_PNGS = iconssets/gg-avail.png iconssets/gg-away.png iconssets/gg-invisible.png iconssets/gg-notavail.png
-PNGS = iconssets/ffc.png iconssets/avail.png iconssets/away.png iconssets/dnd.png iconssets/xa.png iconssets/invisible.png iconssets/notavail.png
+PNGS = iconssets/ffc.png iconssets/avail.png iconssets/away.png iconssets/dnd.png iconssets/xa.png iconssets/invisible.png iconssets/notavail.png iconssets/error.png iconssets/unknown.png
 EXTRA_DIST = chanview-tabs.c chanview-tree.c iconssets/COPYING $(GG_PNGS) $(PNGS)
 
 lib_LTLIBRARIES = gtk.la
@@ -21,4 +21,4 @@
 	gdk-pixbuf-csource --raw --build-list gg_avail iconssets/gg-avail.png gg_away iconssets/gg-away.png gg_invisible iconssets/gg-invisible.png gg_notavail iconssets/gg-notavail.png > inline_pngs_gg.h
 
 inline_pngs.h: $(PNGS)
-	gdk-pixbuf-csource --raw --build-list ffc iconssets/ffc.png avail iconssets/avail.png away iconssets/away.png dnd iconssets/dnd.png xa iconssets/xa.png invisible iconssets/invisible.png notavail iconssets/notavail.png > inline_pngs.h
+	gdk-pixbuf-csource --raw --build-list ffc iconssets/ffc.png avail iconssets/avail.png away iconssets/away.png dnd iconssets/dnd.png xa iconssets/xa.png invisible iconssets/invisible.png notavail iconssets/notavail.png icon_error iconssets/error.png icon_unknown iconssets/unknown.png > inline_pngs.h

Index: palette.c
===================================================================
RCS file: /home/cvs/ekg2/plugins/gtk/palette.c,v
diff -d -u -r1.4 -r1.5
--- palette.c	20 Aug 2007 10:14:08 -0000	1.4
+++ palette.c	26 Aug 2007 22:59:50 -0000	1.5
@@ -201,5 +201,7 @@
 	pixs[PIXBUF_XA] = gdk_pixbuf_new_from_inline(-1, xa, FALSE, 0);
 	pixs[PIXBUF_INVISIBLE] = gdk_pixbuf_new_from_inline(-1, invisible, FALSE, 0);
 	pixs[PIXBUF_NOTAVAIL] = gdk_pixbuf_new_from_inline(-1, notavail, FALSE, 0);
+	pixs[PIXBUF_ERROR] = gdk_pixbuf_new_from_inline(-1, icon_error, FALSE, 0);
+	pixs[PIXBUF_UNKNOWN] = gdk_pixbuf_new_from_inline(-1, icon_unknown, FALSE, 0);
 }
 

Index: palette.h
===================================================================
RCS file: /home/cvs/ekg2/plugins/gtk/palette.h,v
diff -d -u -r1.3 -r1.4
--- palette.h	20 Aug 2007 10:14:08 -0000	1.3
+++ palette.h	26 Aug 2007 22:59:50 -0000	1.4
@@ -24,6 +24,8 @@
 #define PIXBUF_XA 4
 #define PIXBUF_INVISIBLE 5
 #define PIXBUF_NOTAVAIL 6
+#define PIXBUF_ERROR 7
+#define PIXBUF_UNKNOWN 8
 
-#define STATUS_PIXBUFS 7 /* FFC, AVAIL, AWAY, DND, XA, INVISIBLE, NOTAVAIL */
+#define STATUS_PIXBUFS 9 /* FFC, AVAIL, AWAY, DND, XA, INVISIBLE, NOTAVAIL, ERROR, UNKNOWN */
 

Index: userlistgui.c
===================================================================
RCS file: /home/cvs/ekg2/plugins/gtk/userlistgui.c,v
diff -d -u -r1.6 -r1.7
--- userlistgui.c	20 Aug 2007 09:52:38 -0000	1.6
+++ userlistgui.c	26 Aug 2007 22:59:50 -0000	1.7
@@ -294,16 +294,34 @@
 	if (pixmaps) {
 		const char *str;
 		
-	/* blah, awful */
-		str = ekg_status_string(u->status, 0);
-
-		if (!xstrcmp(str, "notavail")) 		pix = pixmaps[PIXBUF_NOTAVAIL];
-		else if (!xstrcmp(str, "invisible"))	pix = pixmaps[PIXBUF_INVISIBLE];
-		else if (!xstrcmp(str, "xa"))		pix = pixmaps[PIXBUF_XA];
-		else if (!xstrcmp(str, "dnd"))		pix = pixmaps[PIXBUF_DND];
-		else if (!xstrcmp(str, "away"))		pix = pixmaps[PIXBUF_AWAY];
-		else if (!xstrcmp(str, "avail"))	pix = pixmaps[PIXBUF_AVAIL];
-		else if (!xstrcmp(str, "ffc"))		pix = pixmaps[PIXBUF_FFC];
+		switch (u->status) {
+			case EKG_STATUS_NA:
+				pix = pixmaps[PIXBUF_NOTAVAIL];
+				break;
+			case EKG_STATUS_INVISIBLE:
+				pix = pixmaps[PIXBUF_INVISIBLE];
+				break;
+			case EKG_STATUS_XA:
+				pix = pixmaps[PIXBUF_XA];
+				break;
+			case EKG_STATUS_DND:
+				pix = pixmaps[PIXBUF_DND];
+				break;
+			case EKG_STATUS_AWAY:
+				pix = pixmaps[PIXBUF_AWAY];
+				break;
+			case EKG_STATUS_AVAIL:
+				pix = pixmaps[PIXBUF_AVAIL];
+				break;
+			case EKG_STATUS_FFC:
+				pix = pixmaps[PIXBUF_FFC];
+				break;
+			case EKG_STATUS_ERROR:
+				pix = pixmaps[PIXBUF_ERROR];
+				break;
+			default: /* + EKG_STATUS_UNKNOWN */
+				pix = pixmaps[PIXBUF_UNKNOWN];
+		}
 	}
 
 #if 0