gdk/gdk.c gdk/gdkinternals.h gdk/win32/gdkmain-win32.c pass argc and argv

2002-07-16  Sven Neumann  <sven@gimp.org>

	* gdk/gdk.c
	* gdk/gdkinternals.h
	* gdk/win32/gdkmain-win32.c
	* gdk/x11/gdkmain-x11.c: pass argc and argv to the GDK backend in
	_gdk_windowing_init() so that the backend has a chance to process
	the command-line arguments (GTK+-DirectFB needs this).

diff --git a/ChangeLog b/ChangeLog
index f7d968164443cceeb2471cf25f0b411430ef8cfd..6017d288d710a7ff6215279a0a7f5deb57f977ad 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2002-07-16  Sven Neumann  <sven@gimp.org>
+
+       * gdk/gdk.c
+       * gdk/gdkinternals.h
+       * gdk/win32/gdkmain-win32.c
+       * gdk/x11/gdkmain-x11.c: pass argc and argv to the GDK backend in
+       _gdk_windowing_init() so that the backend has a chance to process
+       the command-line arguments (GTK+-DirectFB needs this).
+
 2002-07-10  jacob berkman  <jacob@ximian.com>
 
        * gtk/gtkoptionmenu.c (gtk_option_menu_scroll_event): activate the

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index f7d968164443cceeb2471cf25f0b411430ef8cfd..6017d288d710a7ff6215279a0a7f5deb57f977ad 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+2002-07-16  Sven Neumann  <sven@gimp.org>
+
+       * gdk/gdk.c
+       * gdk/gdkinternals.h
+       * gdk/win32/gdkmain-win32.c
+       * gdk/x11/gdkmain-x11.c: pass argc and argv to the GDK backend in
+       _gdk_windowing_init() so that the backend has a chance to process
+       the command-line arguments (GTK+-DirectFB needs this).
+
 2002-07-10  jacob berkman  <jacob@ximian.com>
 
        * gtk/gtkoptionmenu.c (gtk_option_menu_scroll_event): activate the

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index f7d968164443cceeb2471cf25f0b411430ef8cfd..6017d288d710a7ff6215279a0a7f5deb57f977ad 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,12 @@
+2002-07-16  Sven Neumann  <sven@gimp.org>
+
+       * gdk/gdk.c
+       * gdk/gdkinternals.h
+       * gdk/win32/gdkmain-win32.c
+       * gdk/x11/gdkmain-x11.c: pass argc and argv to the GDK backend in
+       _gdk_windowing_init() so that the backend has a chance to process
+       the command-line arguments (GTK+-DirectFB needs this).
+
 2002-07-10  jacob berkman  <jacob@ximian.com>
 
        * gtk/gtkoptionmenu.c (gtk_option_menu_scroll_event): activate the

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index f7d968164443cceeb2471cf25f0b411430ef8cfd..6017d288d710a7ff6215279a0a7f5deb57f977ad 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,12 @@
+2002-07-16  Sven Neumann  <sven@gimp.org>
+
+       * gdk/gdk.c
+       * gdk/gdkinternals.h
+       * gdk/win32/gdkmain-win32.c
+       * gdk/x11/gdkmain-x11.c: pass argc and argv to the GDK backend in
+       _gdk_windowing_init() so that the backend has a chance to process
+       the command-line arguments (GTK+-DirectFB needs this).
+
 2002-07-10  jacob berkman  <jacob@ximian.com>
 
        * gtk/gtkoptionmenu.c (gtk_option_menu_scroll_event): activate the

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index f7d968164443cceeb2471cf25f0b411430ef8cfd..6017d288d710a7ff6215279a0a7f5deb57f977ad 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,12 @@
+2002-07-16  Sven Neumann  <sven@gimp.org>
+
+       * gdk/gdk.c
+       * gdk/gdkinternals.h
+       * gdk/win32/gdkmain-win32.c
+       * gdk/x11/gdkmain-x11.c: pass argc and argv to the GDK backend in
+       _gdk_windowing_init() so that the backend has a chance to process
+       the command-line arguments (GTK+-DirectFB needs this).
+
 2002-07-10  jacob berkman  <jacob@ximian.com>
 
        * gtk/gtkoptionmenu.c (gtk_option_menu_scroll_event): activate the

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index f7d968164443cceeb2471cf25f0b411430ef8cfd..6017d288d710a7ff6215279a0a7f5deb57f977ad 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+2002-07-16  Sven Neumann  <sven@gimp.org>
+
+       * gdk/gdk.c
+       * gdk/gdkinternals.h
+       * gdk/win32/gdkmain-win32.c
+       * gdk/x11/gdkmain-x11.c: pass argc and argv to the GDK backend in
+       _gdk_windowing_init() so that the backend has a chance to process
+       the command-line arguments (GTK+-DirectFB needs this).
+
 2002-07-10  jacob berkman  <jacob@ximian.com>
 
        * gtk/gtkoptionmenu.c (gtk_option_menu_scroll_event): activate the

diff --git a/gdk/gdk.c b/gdk/gdk.c
index 873184042edc88ab3663bc78c7caf71c504afc66..ee77ef78b90a28625164389a9529236d699782bb 100644 (file)
--- a/gdk/gdk.c
+++ b/gdk/gdk.c
@@ -345,7 +345,7 @@ gdk_parse_args (int    *argc,
 
   /* Do any setup particular to the windowing system
    */
-  _gdk_windowing_init ();
+  _gdk_windowing_init (argc, argv);
 }
 
 /** 

diff --git a/gdk/gdkinternals.h b/gdk/gdkinternals.h
index a804882c5a78f45ce2a91d24b9ef59efa478b098..c31dc1615c7b99857160270804e61b1dcc9d4bde 100644 (file)
--- a/gdk/gdkinternals.h
+++ b/gdk/gdkinternals.h
@@ -231,8 +231,9 @@ void _gdk_colormap_real_destroy (GdkColormap *colormap);
 void _gdk_cursor_destroy (GdkCursor *cursor);
 
 extern GdkArgDesc _gdk_windowing_args[];
-void         _gdk_windowing_init                   (void);
-void         _gdk_windowing_set_default_display    (GdkDisplay *display);
+void     _gdk_windowing_init                    (gint       *argc,
+                                                 gchar    ***argv);
+void     _gdk_windowing_set_default_display     (GdkDisplay *display);
 
 void     _gdk_windowing_window_get_offsets      (GdkWindow  *window,
                                                 gint       *x_offset,

diff --git a/gdk/win32/gdkmain-win32.c b/gdk/win32/gdkmain-win32.c
index eb09f05b58bb3363412612652c64c224b7db56d0..a762cee78ed27fbd8bd22099fb96eb1331503f7d 100644 (file)
--- a/gdk/win32/gdkmain-win32.c
+++ b/gdk/win32/gdkmain-win32.c
@@ -67,7 +67,8 @@ DllMain(HINSTANCE hinstDLL,
 }
 
 void
-_gdk_windowing_init (void)
+_gdk_windowing_init (gint    *argc,
+                     gchar ***argv)
 {
   gchar buf[10];
 

diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c
index 6bf483b6b67ff2be6ae993ac9619380dfcbd2a48..36b1d2be2be670d34f61a63271a3149bb2c53b75 100644 (file)
--- a/gdk/x11/gdkmain-x11.c
+++ b/gdk/x11/gdkmain-x11.c
@@ -96,7 +96,8 @@ GdkArgDesc _gdk_windowing_args[] = {
 };
 
 void
-_gdk_windowing_init (void)
+_gdk_windowing_init (gint    *argc,
+                     gchar ***argv)
 {
   _gdk_x11_initialize_locale ();