[Antiright-devel] antiright/gtkshell about_dialog.c callbacks.c t...

[Jeffrey Bedard]

CVSROOT:        /sources/antiright
Module name:    antiright
Changes by:     Jeffrey Bedard <jefbed> 07/05/15 19:04:12

Modified files:
        gtkshell       : about_dialog.c callbacks.c terminal.c 

Log message:
        Converted author setting macro to static function.  

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/about_dialog.c?cvsroot=antiright&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/callbacks.c?cvsroot=antiright&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/terminal.c?cvsroot=antiright&r1=1.19&r2=1.20

Patches:
Index: about_dialog.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/about_dialog.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- about_dialog.c      10 May 2007 00:08:28 -0000      1.5
+++ about_dialog.c      15 May 2007 19:04:12 -0000      1.6
@@ -32,10 +32,12 @@
        g_free(text);
 }
 
-#define SETUP_AUTHORS_FIELD(dialog) \
-{\
-       const gchar *authors[] = GSH_AUTHORS;\
-       gtk_about_dialog_set_authors(GTK_ABOUT_DIALOG(dialog), authors);\
+static void
+setup_authors_field(GtkWidget * dialog)
+{
+       const gchar *authors[] = GSH_AUTHORS;
+
+       gtk_about_dialog_set_authors(GTK_ABOUT_DIALOG(dialog), authors);
 }
 
 #define SET_WEBSITE(dialog)\
@@ -54,7 +56,7 @@
 static GtkWidget *
 setup_about_fields(GtkWidget * dialog)
 {
-       SETUP_AUTHORS_FIELD(dialog);
+       setup_authors_field(dialog);
        setup_about_license(dialog);
        SET_WEBSITE(dialog);
        SET_COMMENTS(dialog);

Index: callbacks.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/callbacks.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- callbacks.c 11 May 2007 23:28:52 -0000      1.26
+++ callbacks.c 15 May 2007 19:04:12 -0000      1.27
@@ -170,11 +170,12 @@
 }
 
 /* Assign the function pointers for GSHCBData's methods.  */
-#define ASSIGN_METHODS(cb)\
-{\
-       cb->delete=&gsh_delete_GSHCBData;\
-       cb->entry=&gsh_entry_cb;\
-       cb->system=&gsh_system_cb;\
+static void
+assign_GSHCBData_methods(struct GSHCBData * cb)
+{
+       cb->delete=&gsh_delete_GSHCBData;
+       cb->entry=&gsh_entry_cb;
+       cb->system=&gsh_system_cb;
 }
 
 /* GSHCBData Constructor */
@@ -189,7 +190,7 @@
        cb->gsh=gsh;
        cb->data=data;
        /* Set up methods.  */
-       ASSIGN_METHODS(cb);
+       assign_GSHCBData_methods(cb);
 
        return cb;
 }

Index: terminal.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/terminal.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- terminal.c  15 May 2007 17:59:35 -0000      1.19
+++ terminal.c  15 May 2007 19:04:12 -0000      1.20
@@ -116,17 +116,16 @@
        }
 }
 
-static GtkWidget *
-gsh_GSH_Terminal_add(struct GSH_Terminal * term, const gchar * command)
+static void
+setup_terminal_signals(struct GSH_Terminal * term)
 {
-       GtkWidget * widget;
        GSH * gsh;
+       GtkWidget * widget;
 
        gsh=(GSH *)term->gsh;
-       /* Create and set properties of the VTE-based terminal.  */
+       widget=term->widget;
        /* Exit from the application if the terminal process dies.  */
-       g_signal_connect(G_OBJECT(widget=term->widget=vte_terminal_new()), 
-               "child-exited", G_CALLBACK(gtk_main_quit), NULL);
+       GSHCONNECT(widget, "child-exited", gtk_main_quit, NULL);
        {
                struct GSHCBData * cb;
 
@@ -136,6 +135,14 @@
                GSHCONNECT(widget, "window-title-changed", 
                        title_change_cb, cb);
        }
+}
+
+static GtkWidget *
+gsh_GSH_Terminal_add(struct GSH_Terminal * term, const gchar * command)
+{
+       /* Create and set properties of the VTE-based terminal.  */
+       term->widget = vte_terminal_new();
+       setup_terminal_signals(term);
        set_terminal_options(term);
        gsh_terminal_run(term, command);
 
@@ -177,4 +184,3 @@
        return term;
 }
 
-