[Antiright-devel] antiright/gtkshell arguments.c guidl.y guidl_ut...

[Jeffrey Bedard]

CVSROOT:        /sources/antiright
Module name:    antiright
Changes by:     Jeffrey Bedard <jefbed> 07/04/09 20:25:15

Modified files:
        gtkshell       : arguments.c guidl.y guidl_util.c guidl_util.h 

Log message:
        Added dialog type handler functions to guidl_util.c,
        from guidl.y.  

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/arguments.c?cvsroot=antiright&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/guidl.y?cvsroot=antiright&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/guidl_util.c?cvsroot=antiright&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/guidl_util.h?cvsroot=antiright&r1=1.1&r2=1.2

Patches:
Index: arguments.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/arguments.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- arguments.c 6 Apr 2007 15:05:28 -0000       1.17
+++ arguments.c 9 Apr 2007 20:25:15 -0000       1.18
@@ -24,6 +24,7 @@
 #include "gtkshell.h"
 
 #define SPLIT_ALL -1
+
 /* Decide whether to use a regular button or a menu button.  */
 static void
 button_parse(struct GSH * gsh, const gchar * string)

Index: guidl.y
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/guidl.y,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- guidl.y     9 Apr 2007 15:27:47 -0000       1.10
+++ guidl.y     9 Apr 2007 20:25:15 -0000       1.11
@@ -86,44 +86,12 @@
 dialog:
 DIALOG STRING
 {
-       gchar * option_string=NULL;
-       if(!strcmp($2, "file"))
-               option_string=g_strdup("-df");
-       else if(!strcmp($2, "font"))
-               option_string=g_strdup("-dF");
-       else if(!strcmp($2, "about"))
-               option_string=g_strdup("-da");
-       else if(!strcmp($2, "folder"))
-               option_string=g_strdup("-dd");
-       else if(!strcmp($2, "create folder"))
-               option_string=g_strdup("-dD");
-       else if(!strcmp($2, "save"))
-               option_string=g_strdup("-ds");
-       else if(!strcmp($2, "color"))
-               option_string=g_strdup("-dc");
-       else
-               ARERR("unknown dialog type");
-
-       ARPASSERT(option_string);
-       gsh_append_arg(option_string);
+       gsh_guidl_string_dialog($2);
 }
 |
 DIALOG STRING STRING
 {
-       gchar * option_string=NULL;
-
-       if(!strcmp($2, "info"))
-               option_string=g_strdup("-di");
-       else if(!strcmp($2, "warning"))
-               option_string=g_strdup("-dw");
-       else if(!strcmp($2, "error"))
-               option_string=g_strdup("-de");
-       else
-               ARERR("unknown dialog type");
-
-       ARPASSERT(option_string);
-       gsh_guidl_add(option_string, $3);
-       g_free(option_string);
+       gsh_guidl_string_dialog_argument($2, $3);
 }
 ;
 

Index: guidl_util.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/guidl_util.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- guidl_util.c        1 Apr 2007 05:34:56 -0000       1.3
+++ guidl_util.c        9 Apr 2007 20:25:15 -0000       1.4
@@ -42,6 +42,52 @@
 }
 
 void
+gsh_guidl_string_dialog(gchar * string)
+{
+        gchar * option_string=NULL;
+
+        if(!strcmp(string, "file"))
+                option_string=g_strdup("-df");
+        else if(!strcmp(string, "font"))
+                option_string=g_strdup("-dF");
+        else if(!strcmp(string, "about"))
+                option_string=g_strdup("-da");
+        else if(!strcmp(string, "folder"))
+                option_string=g_strdup("-dd");
+        else if(!strcmp(string, "create folder"))
+                option_string=g_strdup("-dD");
+        else if(!strcmp(string, "save"))
+                option_string=g_strdup("-ds");
+        else if(!strcmp(string, "color"))
+                option_string=g_strdup("-dc");
+        else
+                ARERR("unknown dialog type");
+
+        ARPASSERT(option_string);
+        gsh_append_arg(option_string);
+       g_free(option_string);
+}
+
+void
+gsh_guidl_string_dialog_argument(gchar * string, gchar * argument)
+{
+        gchar * option_string=NULL;
+
+        if(!strcmp(string, "info"))
+                option_string=g_strdup("-di");
+        else if(!strcmp(string, "warning"))
+                option_string=g_strdup("-dw");
+        else if(!strcmp(string, "error"))
+                option_string=g_strdup("-de");
+        else
+                ARERR("unknown dialog type");
+
+        ARPASSERT(option_string);
+        gsh_guidl_add(option_string, argument);
+        g_free(option_string);
+}
+
+void
 gsh_guidl_string_option(gchar * string)
 {
        gchar option;
@@ -58,7 +104,7 @@
                option='s';
        else if(!strcmp(string, "no label fill"))
                option='l';
-       else if(!strcmp(string, "label fill")) /* default */
+       else if(!strcmp(string, "label fill")) /* default fill type */
                option='L';
        else
        {

Index: guidl_util.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/guidl_util.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- guidl_util.h        19 Mar 2007 09:33:07 -0000      1.1
+++ guidl_util.h        9 Apr 2007 20:25:15 -0000       1.2
@@ -48,4 +48,10 @@
 void
 gsh_guidl_add(const char * switches, gchar * argument);
 
+void
+gsh_guidl_string_dialog(gchar * string);
+
+void
+gsh_guidl_string_dialog_argument(gchar * string, gchar * argument);
+
 #endif /* not GSH_GUIDL_UTIL_H */