[Antiright-devel] antiright/gtkshell add_options.c options.c swal...

[Jeffrey Bedard]

CVSROOT:        /sources/antiright
Module name:    antiright
Changes by:     Jeffrey Bedard <jefbed> 07/11/29 18:22:45

Modified files:
        gtkshell       : add_options.c options.c swallow.c swallow.h 

Log message:
        Further refine app swallowing.  Add to add_options switch.  

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/add_options.c?cvsroot=antiright&r1=1.50&r2=1.51
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/options.c?cvsroot=antiright&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/swallow.c?cvsroot=antiright&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/swallow.h?cvsroot=antiright&r1=1.2&r2=1.3

Patches:
Index: add_options.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/add_options.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- add_options.c       24 Nov 2007 10:53:41 -0000      1.50
+++ add_options.c       29 Nov 2007 18:22:44 -0000      1.51
@@ -142,6 +142,7 @@
        }
 }
 
+
 void
 gsh_handle_add_arguments(GSH * gsh, const gint argc, const gchar **argv, 
        gint *counter)
@@ -244,7 +245,9 @@
        case 'w':
                add_new_window(gsh);
                break;
-
+       case 'X':
+               gsh_add_embedded(gsh, argv[++(*counter)]);
+               break;
        default:
                ARWARN("invalid add option");
        }

Index: options.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/options.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- options.c   26 Nov 2007 22:40:46 -0000      1.32
+++ options.c   29 Nov 2007 18:22:44 -0000      1.33
@@ -110,14 +110,6 @@
                HANDLE(option);
                break;
        case 't': /* test area.  */
-               {
-                       GtkWidget * swallower;
-                       swallower=gtk_socket_new();
-                       $(gsh, manage, swallower);
-                       gtk_widget_show_all(gsh->widgets.window);
-                       GSH_COUNT(argc, counter);
-                       gsh_swallow_app(swallower, argv[*counter]);
-               }
                break;
        default:
                gsh_invalid_option(argv, *counter);

Index: swallow.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/swallow.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- swallow.c   26 Nov 2007 22:40:46 -0000      1.2
+++ swallow.c   29 Nov 2007 18:22:44 -0000      1.3
@@ -203,3 +203,14 @@
        (void) g_timeout_add(1000, swallow_app, swallow_manager);
 }
 
+void
+gsh_add_embedded(GSH * gsh, char * identifier)
+{
+       GtkWidget * swallower;
+
+       swallower=gtk_socket_new();
+       $(gsh, manage, swallower);
+       gtk_widget_show_all(gsh->widgets.window);
+       gsh_swallow_app(swallower, identifier);
+}
+

Index: swallow.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/swallow.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- swallow.h   26 Nov 2007 22:40:46 -0000      1.2
+++ swallow.h   29 Nov 2007 18:22:44 -0000      1.3
@@ -26,5 +26,8 @@
 void
 gsh_swallow_app(GtkWidget * target, const gchar * source_name);
 
+void
+gsh_add_embedded(GSH * gsh, char * identifier);
+
 #endif /* GSH_SWALLOW_H */