[Antiright-devel] antiright gtkshell/clock.c gtkshell/updated_lab...

[Jeffrey Bedard]

CVSROOT:        /sources/antiright
Module name:    antiright
Changes by:     Jeffrey Bedard <jefbed> 07/11/23 23:15:32

Modified files:
        gtkshell       : clock.c updated_label.c 
        xshell         : Makefile decoration.c 

Log message:
        Removed unnecessary macros to improve code readability.
        Removed indicator from xshell buttons, as it is useless.  

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/clock.c?cvsroot=antiright&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/updated_label.c?cvsroot=antiright&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/antiright/xshell/Makefile?cvsroot=antiright&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/antiright/xshell/decoration.c?cvsroot=antiright&r1=1.8&r2=1.9

Patches:
Index: gtkshell/clock.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/clock.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- gtkshell/clock.c    22 Jul 2007 19:07:32 -0000      1.6
+++ gtkshell/clock.c    23 Nov 2007 23:15:31 -0000      1.7
@@ -53,11 +53,6 @@
        gtk_label_set_text(GTK_LABEL((GtkWidget *)clock_pointer), time_string);
 }
 
-#define GSH_SET_CLOCK_COLORS(clock, event_box)\
-       gsh_widget_set_color(event_box, "#223", FALSE);\
-       gsh_widget_set_color(clock, "#dde", TRUE);
-       
-
 static GtkWidget *
 setup_containers(GtkWidget * clock)
 {
@@ -69,10 +64,13 @@
                GtkWidget * event_box;
 
                gtk_widget_show(event_box=gtk_event_box_new());
+               /* Setup containers.  */
                GSHCA(frame, event_box);
-               GSH_SET_CLOCK_COLORS(clock, event_box);
                GSHCA(event_box, clock);
+               /* Set clock colors.  */
+               gsh_widget_set_color(event_box, "#223", FALSE);
        }
+       gsh_widget_set_color(clock, "#dde", TRUE);
 
        return frame;
 }

Index: gtkshell/updated_label.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/updated_label.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- gtkshell/updated_label.c    22 Jul 2007 17:51:21 -0000      1.24
+++ gtkshell/updated_label.c    23 Nov 2007 23:15:31 -0000      1.25
@@ -22,32 +22,24 @@
 
 #include "gtkshell.h"
 
-/* This ensures that the result string is not empty, avoiding
- * certain formatting problems.
- * Otherwise, a GTK warning and termination occurs.  */
-
-#define CHECK_RESULTS(results) \
-{\
-       if (results[0] == '\0')\
-       {\
-               g_free(results);\
-               results=g_strdup("(empty)");\
-       }\
-}
-
 static void
 gsh_update_label(const gchar *command, gpointer widget)
 {
        gchar *results;
 
 #ifdef DEBUG
-       ARBUG("gsh_update_label()");
-
        ARPASSERT(command);
        ARPASSERT(widget);
 #endif /* DEBUG */
        results=antiright_pipe_read(command);
-       CHECK_RESULTS(results);
+       /* This ensures that the result string is not empty, avoiding
+        * certain formatting problems.
+        * Otherwise, a GTK warning and termination occurs.  */
+       if (results[0] == '\0')
+       {
+               g_free(results);
+               results=g_strdup("(empty)");
+       }
        if(GTK_IS_LABEL(widget))
                gtk_label_set_text(GTK_LABEL(widget), results);
        else if(GTK_IS_STATUSBAR(widget))

Index: xshell/Makefile
===================================================================
RCS file: /sources/antiright/antiright/xshell/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- xshell/Makefile     28 Aug 2007 19:39:12 -0000      1.5
+++ xshell/Makefile     23 Nov 2007 23:15:31 -0000      1.6
@@ -37,6 +37,8 @@
 #CFLAGS+=-DXSH_USE_GRADIENT
 #CFLAGS+=-DDEBUG -g3 -Wall -W
 #CFLAGS+=-DDEBUG_EVENTS
+# This is for a button status indicator, currently just a decoration.  
+#CFLAGS+=-DXSH_USE_INDICATOR
 LIBS=-L/usr/X11R6/lib -L/usr/pkg/lib -lX11
 LDFLAGS=$(LIBS)
 

Index: xshell/decoration.c
===================================================================
RCS file: /sources/antiright/antiright/xshell/decoration.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- xshell/decoration.c 20 Aug 2007 16:12:09 -0000      1.8
+++ xshell/decoration.c 23 Nov 2007 23:15:31 -0000      1.9
@@ -57,6 +57,7 @@
        XDrawLine(dpy, win, gc, geometry.width-1, 0, 
                geometry.width-1, geometry.height);
 
+#ifdef XSH_USE_INDICATOR
        SET_COLOR(dpy, gc, 0xae, 0xff, 0xc3);
        XFillArc(dpy, win, gc, geometry.width-8,
                geometry.height/5, 4, 8, 0, 360*64);
@@ -66,7 +67,7 @@
        SET_COLOR(dpy, gc, (0xae)/3, (0xb2)/3, (0xc3)/3);
        XDrawArc(dpy, win, gc, geometry.width-8,
                geometry.height/5, 5, 9, 0, 360*64);
-
+#endif /* XSH_USE_INDICATOR */
 }
 
 #ifdef XSH_USE_GRADIENT