[Antiright-devel] antiright gtkshell/button.c gtkshell/dragdrop.c...

[Jeffrey Bedard]

CVSROOT:        /sources/antiright
Module name:    antiright
Changes by:     Jeffrey Bedard <jefbed> 07/04/13 14:23:51

Modified files:
        gtkshell       : button.c dragdrop.c 
        libantiright   : string.c 

Log message:
        Split out string substitution portion of antiright_beautified_label().  

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/button.c?cvsroot=antiright&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/dragdrop.c?cvsroot=antiright&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/antiright/libantiright/string.c?cvsroot=antiright&r1=1.8&r2=1.9

Patches:
Index: gtkshell/button.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/button.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- gtkshell/button.c   6 Apr 2007 15:05:28 -0000       1.21
+++ gtkshell/button.c   13 Apr 2007 14:23:51 -0000      1.22
@@ -74,17 +74,11 @@
        cb=setup_callback_data(gsh, command);
 
        if(GTK_IS_MENU_ITEM(gsh->button))
-       {
                (void) g_signal_connect(G_OBJECT(gsh->button), 
                                "activate", G_CALLBACK(system_cb), cb);
-
-       }
        else if((gsh->bflags & GSH_MENU_BUTTON) != GSH_MENU_BUTTON)
-       {
-               /* @null@ */
                (void) g_signal_connect(G_OBJECT(gsh->button), 
                                "clicked", G_CALLBACK(system_cb), cb);
-       }
        else if((gsh->bflags & GSH_MENU_BUTTON) == GSH_MENU_BUTTON)
                gsh->bflags ^= GSH_MENU_BUTTON;
 
@@ -101,6 +95,14 @@
        gtk_widget_show(gsh->button);
 }
 
+static void
+setup_command_button(struct GSH * gsh, char * command)
+{
+       setup_label(gsh->button, command);
+       gsh_setup_drag_drop(gsh, gsh->button);
+       setup_callback(gsh, command);
+}
+
 void
 gsh_command_button(struct GSH * gsh, char *command)
 {
@@ -111,9 +113,7 @@
        ARPASSERT(gsh);
 
        create_button(gsh);
-       setup_label(gsh->button, command);
-       gsh_setup_drag_drop(gsh, gsh->button);
-       setup_callback(gsh, command);
+       setup_command_button(gsh, command);
        gsh_manage_unexpanded(gsh, gsh->button);
 
 #ifdef DEBUG
@@ -134,11 +134,8 @@
        if(ARPBOOL(pair[0]) && ARPBOOL(pair[1]))
        {
                gchar * command;
-               gint return_value;
 
-               return_value=ar_asprintf(&command, 
-                                        "%s", pair[0]);
-               if(return_value != -1)
+               if(ar_asprintf(&command, "%s", pair[0]) != -1)
                        gsh_image_button(gsh, command, pair[1]);
                else
                        ARWARN("cannot create button");

Index: gtkshell/dragdrop.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/dragdrop.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- gtkshell/dragdrop.c 7 Mar 2007 06:44:47 -0000       1.9
+++ gtkshell/dragdrop.c 13 Apr 2007 14:23:51 -0000      1.10
@@ -57,6 +57,17 @@
 static void
      drag_end(GtkWidget *widget, GdkDragContext * context, gpointer data);*/
 
+static void
+setup_drag_drop_signals(GtkWidget * widget)
+{
+       (void) g_signal_connect(widget, "drag-data-received",
+                               G_CALLBACK(drag_received), NULL);
+       (void) g_signal_connect(widget, "drag-drop", 
+                               G_CALLBACK(drag_drop), NULL);
+       (void) g_signal_connect(widget, "drag-data-get",
+                               G_CALLBACK(drag_data_get), NULL);
+}
+
 void
 gsh_setup_drag_drop(struct GSH * gsh, GtkWidget *widget)
 {
@@ -67,12 +78,7 @@
        gtk_drag_source_set(widget, GDK_BUTTON1_MASK, target_list, n_targets,
                            GDK_ACTION_COPY);
 
-       (void) g_signal_connect(widget, "drag-data-received",
-                               G_CALLBACK(drag_received), NULL);
-       (void) g_signal_connect(widget, "drag-drop", 
-                               G_CALLBACK(drag_drop), NULL);
-       (void) g_signal_connect(widget, "drag-data-get",
-                               G_CALLBACK(drag_data_get), NULL);
+       setup_drag_drop_signals(widget);
 
        if ((gsh->bflags & GSH_CBEXIT) == GSH_CBEXIT)
                (void) g_signal_connect(widget, "drag-end",

Index: libantiright/string.c
===================================================================
RCS file: /sources/antiright/antiright/libantiright/string.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- libantiright/string.c       10 Apr 2007 22:38:29 -0000      1.8
+++ libantiright/string.c       13 Apr 2007 14:23:51 -0000      1.9
@@ -71,6 +71,17 @@
        (*formatted)[i]='\0';
 }
 
+static char *
+get_substituted_label_from_text(char * text, gint length)
+{
+       gchar * formatted;
+
+       length=ar_asprintf(&formatted, "%s", text);
+       substitute(&formatted, length);
+
+       return (formatted);
+}
+
 /* Free the returned value!  */
 char *
 antiright_beautified_label(char *text)
@@ -80,13 +91,6 @@
        length=strlen(text);
        text += get_last_space(text, length);
 
-       {
-               gchar * formatted;
-
-               length=ar_asprintf(&formatted, "%s", text);
-               substitute(&formatted, length);
-
-               return (formatted);
-       }
+       return get_substituted_label_from_text(text, length);
 }