[Antiright-devel] antiright ACE-desktop/guidl/Horizontal_Deskbar....

[Jeffrey Bedard]

CVSROOT:        /sources/antiright
Module name:    antiright
Changes by:     Jeffrey Bedard <jefbed> 07/05/21 00:11:39

Modified files:
        ACE-desktop/guidl: Horizontal_Deskbar.gdl 
        gtkshell       : add_options.c clock.c update_manager.c 
                         update_manager_struct.h updated_options.c 

Log message:
        Use date format as was used with previous deskbar clock.  Use clock
        applet with deskbar.  Removed start method from update manager, as
        called internally.  

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/guidl/Horizontal_Deskbar.gdl?cvsroot=antiright&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/add_options.c?cvsroot=antiright&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/clock.c?cvsroot=antiright&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/update_manager.c?cvsroot=antiright&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/update_manager_struct.h?cvsroot=antiright&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/updated_options.c?cvsroot=antiright&r1=1.19&r2=1.20

Patches:
Index: ACE-desktop/guidl/Horizontal_Deskbar.gdl
===================================================================
RCS file: 
/sources/antiright/antiright/ACE-desktop/guidl/Horizontal_Deskbar.gdl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- ACE-desktop/guidl/Horizontal_Deskbar.gdl    20 May 2007 01:04:43 -0000      
1.16
+++ ACE-desktop/guidl/Horizontal_Deskbar.gdl    21 May 2007 00:11:38 -0000      
1.17
@@ -88,7 +88,9 @@
        "ACE Screen,Screen_32.png",
        "ACE System_Monitor,System_Monitor_32.png";
 add "separator";
-add "updating label" "date '+%m/%d/%y%n%H:%M:%S'";
+// Add a clock.  
+//add "updating label" "date '+%m/%d/%y%n%H:%M:%S'";
+add "clock applet";
 
 // Uncomment the following if you want a custom command updated each
 //add "separator";

Index: gtkshell/add_options.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/add_options.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- gtkshell/add_options.c      20 May 2007 18:29:57 -0000      1.38
+++ gtkshell/add_options.c      21 May 2007 00:11:38 -0000      1.39
@@ -133,7 +133,6 @@
 
                clock=gsh_clock_new(gsh);
                $(gsh, manage, clock);
-               $(gsh->update, start);
        }
                break;
        default:

Index: gtkshell/clock.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/clock.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gtkshell/clock.c    20 May 2007 18:29:57 -0000      1.1
+++ gtkshell/clock.c    21 May 2007 00:11:38 -0000      1.2
@@ -27,13 +27,18 @@
 get_time_string()
 {
        gchar * time_string;
+       struct tm split_time;
+       time_t time_value;
 
-       {
-               time_t time_data;
-
-               (void)time(&time_data);
-               time_string=ctime(&time_data);
-       }
+       (void)time(&time_value);
+       (void)localtime_r(&time_value, &split_time);
+       asprintf(&time_string, "%.2d/%.2d/%.2d\n%.2d:%.2d:%.2d",
+               split_time.tm_mon+1,
+               split_time.tm_mday,
+               split_time.tm_year%100,
+               split_time.tm_hour,
+               split_time.tm_min,
+               split_time.tm_sec);
 
        return time_string;
 }
@@ -42,10 +47,13 @@
 update_clock(const gchar * command, gpointer clock_pointer)
 {
        GtkWidget * clock;
+       gchar * time_string;
 
        UNUSED(command);
        clock=(GtkWidget *)clock_pointer;
-       gtk_label_set_text(GTK_LABEL(clock), get_time_string());
+       time_string=get_time_string();
+       gtk_label_set_text(GTK_LABEL(clock), time_string);
+       g_free(time_string);
 }
 
 GtkWidget *
@@ -55,7 +63,7 @@
        struct GSHUpdatedWidget * updated_widget;
        
        clock=gtk_label_new(NULL);
-       gtk_widget_set_size_request(clock, 96, 48);
+       gsh_widget_set_font(clock, NULL);
        updated_widget=ARNEW(gsh, GSHUpdatedWidget, 
                &update_clock, NULL, clock);
        $(gsh->update, add, updated_widget); 

Index: gtkshell/update_manager.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/update_manager.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- gtkshell/update_manager.c   20 May 2007 22:45:16 -0000      1.6
+++ gtkshell/update_manager.c   21 May 2007 00:11:38 -0000      1.7
@@ -142,7 +142,6 @@
 {
        update->delete=&gsh_delete_GSHUpdateManager;
        update->add=&gsh_GSHUpdateManager_add;
-       update->start=&gsh_GSHUpdateManager_start;
 }
 
 /* Setup member data fields.  */

Index: gtkshell/update_manager_struct.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/update_manager_struct.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gtkshell/update_manager_struct.h    20 May 2007 18:29:58 -0000      1.2
+++ gtkshell/update_manager_struct.h    21 May 2007 00:11:38 -0000      1.3
@@ -30,7 +30,6 @@
        gboolean updating;
        void (*delete)(struct GSHUpdateManager *);
        void (*add)(struct GSHUpdateManager * , struct GSHUpdatedWidget *);
-       void (*start)(struct GSHUpdateManager *);
 };
 
 #endif /* GSH_UMS_H */

Index: gtkshell/updated_options.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/updated_options.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- gtkshell/updated_options.c  20 May 2007 22:45:16 -0000      1.19
+++ gtkshell/updated_options.c  21 May 2007 00:11:38 -0000      1.20
@@ -28,8 +28,6 @@
 {
        GSH_COUNT(argc, counter);
        add_func(gsh, argv[*counter]);
-       if(!gsh->update->updating)
-               $(gsh->update, start);
 }
 
 #define UADD(type) \