SOURCES: libgnomeui-gdestroynotify.patch (NEW), libgnomeui-gtype.patch (NEW...
patrys
patrys at pld-linux.org
Wed Aug 6 14:28:23 CEST 2008
Author: patrys Date: Wed Aug 6 12:28:22 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- fix deprecated parts of API
---- Files affected:
SOURCES:
libgnomeui-gdestroynotify.patch (NONE -> 1.1) (NEW), libgnomeui-gtype.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/libgnomeui-gdestroynotify.patch
diff -u /dev/null SOURCES/libgnomeui-gdestroynotify.patch:1.1
--- /dev/null Wed Aug 6 14:28:23 2008
+++ SOURCES/libgnomeui-gdestroynotify.patch Wed Aug 6 14:28:16 2008
@@ -0,0 +1,387 @@
+diff -ur libgnomeui-2.23.4.orig/libgnomeui/gnome-app-helper.c libgnomeui-2.23.4/libgnomeui/gnome-app-helper.c
+--- libgnomeui-2.23.4.orig/libgnomeui/gnome-app-helper.c 2008-08-06 13:35:38.936693863 +0200
++++ libgnomeui-2.23.4/libgnomeui/gnome-app-helper.c 2008-08-06 13:36:32.785696110 +0200
+@@ -1182,7 +1182,7 @@
+ typedef struct
+ {
+ GtkCallbackMarshal relay_func;
+- GtkDestroyNotify destroy_func;
++ GDestroyNotify destroy_func;
+ gpointer user_data;
+ } SavedData;
+
+@@ -1553,7 +1553,7 @@
+ void
+ gnome_app_create_menus_interp (GnomeApp *app, GnomeUIInfo *uiinfo,
+ GtkCallbackMarshal relay_func, gpointer data,
+- GtkDestroyNotify destroy_func)
++ GDestroyNotify destroy_func)
+ {
+ GnomeUIBuilderData uibdata;
+
+@@ -1959,7 +1959,7 @@
+ void
+ gnome_app_create_toolbar_interp (GnomeApp *app, GnomeUIInfo *uiinfo,
+ GtkCallbackMarshal relay_func, gpointer data,
+- GtkDestroyNotify destroy_func)
++ GDestroyNotify destroy_func)
+ {
+ GnomeUIBuilderData uibdata;
+
+@@ -2396,7 +2396,7 @@
+ void
+ gnome_app_insert_menus_interp (GnomeApp *app, const gchar *path,
+ GnomeUIInfo *menuinfo, GtkCallbackMarshal relay_func,
+- gpointer data, GtkDestroyNotify destroy_func)
++ gpointer data, GDestroyNotify destroy_func)
+ {
+ GnomeUIBuilderData uidata =
+ {
+diff -ur libgnomeui-2.23.4.orig/libgnomeui/gnome-app-helper.h libgnomeui-2.23.4/libgnomeui/gnome-app-helper.h
+--- libgnomeui-2.23.4.orig/libgnomeui/gnome-app-helper.h 2008-08-06 13:35:38.856188079 +0200
++++ libgnomeui-2.23.4/libgnomeui/gnome-app-helper.h 2008-08-06 13:36:23.425686246 +0200
+@@ -618,7 +618,7 @@
+ gpointer data;
+ gboolean is_interp;
+ GtkCallbackMarshal relay_func;
+- GtkDestroyNotify destroy_func;
++ GDestroyNotify destroy_func;
+ };
+
+ /* Flush the accelerator definitions into the application specific
+@@ -685,7 +685,7 @@
+ */
+ void gnome_app_create_menus_interp (GnomeApp *app, GnomeUIInfo *uiinfo,
+ GtkCallbackMarshal relay_func, gpointer data,
+- GtkDestroyNotify destroy_func);
++ GDestroyNotify destroy_func);
+
+ /* Constructs a menu bar, sets all the user data pointers to the specified value, and attaches it to
+ * the specified application window.
+@@ -723,7 +723,7 @@
+ */
+ void gnome_app_create_toolbar_interp (GnomeApp *app, GnomeUIInfo *uiinfo,
+ GtkCallbackMarshal relay_func, gpointer data,
+- GtkDestroyNotify destroy_func);
++ GDestroyNotify destroy_func);
+
+ /* Constructs a toolbar, sets all the user data pointers to the specified value, and attaches it to
+ * the specified application window.
+@@ -769,7 +769,7 @@
+
+ void gnome_app_insert_menus_interp (GnomeApp *app, const gchar *path, GnomeUIInfo *menuinfo,
+ GtkCallbackMarshal relay_func, gpointer data,
+- GtkDestroyNotify destroy_func);
++ GDestroyNotify destroy_func);
+
+
+ /* Activate the menu item hints, displaying in the given appbar.
+diff -ur libgnomeui-2.23.4.orig/libgnomeui/gnome-client.c libgnomeui-2.23.4/libgnomeui/gnome-client.c
+--- libgnomeui-2.23.4.orig/libgnomeui/gnome-client.c 2008-08-06 13:35:38.865696081 +0200
++++ libgnomeui-2.23.4/libgnomeui/gnome-client.c 2008-08-06 13:37:24.111696262 +0200
+@@ -121,7 +121,7 @@
+ gboolean interp;
+ GnomeInteractFunction function;
+ gpointer data;
+- GtkDestroyNotify destroy;
++ GDestroyNotify destroy;
+ };
+
+
+@@ -135,7 +135,7 @@
+ gboolean interp,
+ GnomeInteractFunction function,
+ gpointer data,
+- GtkDestroyNotify destroy)
++ GDestroyNotify destroy)
+ {
+ static gint tag= 1;
+
+@@ -2518,7 +2518,7 @@
+ gboolean interp,
+ GnomeInteractFunction function,
+ gpointer data,
+- GtkDestroyNotify destroy)
++ GDestroyNotify destroy)
+ {
+ #ifdef HAVE_LIBSM
+ Status status;
+@@ -2703,7 +2703,7 @@
+ GnomeDialogType dialog_type,
+ GtkCallbackMarshal function,
+ gpointer data,
+- GtkDestroyNotify destroy)
++ GDestroyNotify destroy)
+ {
+ g_return_if_fail (client != NULL);
+ g_return_if_fail (GNOME_IS_CLIENT (client));
+diff -ur libgnomeui-2.23.4.orig/libgnomeui/gnome-client.h libgnomeui-2.23.4/libgnomeui/gnome-client.h
+--- libgnomeui-2.23.4.orig/libgnomeui/gnome-client.h 2008-08-06 13:35:38.918798909 +0200
++++ libgnomeui-2.23.4/libgnomeui/gnome-client.h 2008-08-06 13:37:33.214696014 +0200
+@@ -457,7 +457,7 @@
+ GnomeDialogType dialog_type,
+ GtkCallbackMarshal function,
+ gpointer data,
+- GtkDestroyNotify destroy);
++ GDestroyNotify destroy);
+
+ /* 'gnome_interaction_key_return' is used to tell gnome, that you are
+ finished with interaction */
+diff -ur libgnomeui-2.23.4.orig/libgnomeui/gnome-mdi-generic-child.c libgnomeui-2.23.4/libgnomeui/gnome-mdi-generic-child.c
+--- libgnomeui-2.23.4.orig/libgnomeui/gnome-mdi-generic-child.c 2008-08-06 13:35:38.945685997 +0200
++++ libgnomeui-2.23.4/libgnomeui/gnome-mdi-generic-child.c 2008-08-06 13:36:49.968696108 +0200
+@@ -150,7 +150,7 @@
+ GnomeMDIChildViewCreator func,
+ GtkCallbackMarshal marshal,
+ gpointer data,
+- GtkDestroyNotify notify)
++ GDestroyNotify notify)
+ {
+ if(child->create_view_dn)
+ child->create_view_dn(child->create_view_data);
+@@ -198,7 +198,7 @@
+ GnomeMDIChildMenuCreator func,
+ GtkCallbackMarshal marshal,
+ gpointer data,
+- GtkDestroyNotify notify)
++ GDestroyNotify notify)
+ {
+ if(child->create_menus_dn)
+ child->create_menus_dn(child->create_menus_data);
+@@ -243,7 +243,7 @@
+ GnomeMDIChildConfigFunc func,
+ GtkCallbackMarshal marshal,
+ gpointer data,
+- GtkDestroyNotify notify)
++ GDestroyNotify notify)
+ {
+ if(child->get_config_string_dn)
+ child->get_config_string_dn(child->get_config_string_data);
+@@ -292,7 +292,7 @@
+ GnomeMDIChildLabelFunc func,
+ GtkCallbackMarshal marshal,
+ gpointer data,
+- GtkDestroyNotify notify)
++ GDestroyNotify notify)
+ {
+ if(child->set_label_dn)
+ child->set_label_dn(child->set_label_data);
+diff -ur libgnomeui-2.23.4.orig/libgnomeui/gnome-mdi-generic-child.h libgnomeui-2.23.4/libgnomeui/gnome-mdi-generic-child.h
+--- libgnomeui-2.23.4.orig/libgnomeui/gnome-mdi-generic-child.h 2008-08-06 13:35:38.945685997 +0200
++++ libgnomeui-2.23.4/libgnomeui/gnome-mdi-generic-child.h 2008-08-06 13:36:59.775835844 +0200
+@@ -59,7 +59,7 @@
+
+ GtkCallbackMarshal create_view_cbm, create_menus_cbm,
+ get_config_string_cbm, set_label_cbm;
+- GtkDestroyNotify create_view_dn, create_menus_dn,
++ GDestroyNotify create_view_dn, create_menus_dn,
+ get_config_string_dn, set_label_dn;
+ gpointer create_view_data, create_menus_data,
+ get_config_string_data, set_label_data;
+@@ -82,7 +82,7 @@
+ GnomeMDIChildViewCreator func,
+ GtkCallbackMarshal marshal,
+ gpointer data,
+- GtkDestroyNotify notify);
++ GDestroyNotify notify);
+ void gnome_mdi_generic_child_set_menu_creator (GnomeMDIGenericChild *child,
+ GnomeMDIChildMenuCreator func,
+ gpointer data);
+@@ -90,7 +90,7 @@
+ GnomeMDIChildMenuCreator func,
+ GtkCallbackMarshal marshal,
+ gpointer data,
+- GtkDestroyNotify notify);
++ GDestroyNotify notify);
+ void gnome_mdi_generic_child_set_config_func (GnomeMDIGenericChild *child,
+ GnomeMDIChildConfigFunc func,
+ gpointer data);
+@@ -98,7 +98,7 @@
+ GnomeMDIChildConfigFunc func,
+ GtkCallbackMarshal marshal,
+ gpointer data,
+- GtkDestroyNotify notify);
++ GDestroyNotify notify);
+ void gnome_mdi_generic_child_set_label_func (GnomeMDIGenericChild *child,
+ GnomeMDIChildLabelFunc func,
+ gpointer data);
+@@ -106,7 +106,7 @@
+ GnomeMDIChildLabelFunc func,
+ GtkCallbackMarshal marshal,
+ gpointer data,
+- GtkDestroyNotify notify);
++ GDestroyNotify notify);
+
+
+ G_END_DECLS
+diff -ur libgnomeui-2.23.4.orig/doc/reference/xml/gnome-app-helper.xml libgnomeui-2.23.4/doc/reference/xml/gnome-app-helper.xml
+--- libgnomeui-2.23.4.orig/doc/reference/xml/gnome-app-helper.xml 2008-08-06 13:35:38.603685915 +0200
++++ libgnomeui-2.23.4/doc/reference/xml/gnome-app-helper.xml 2008-08-06 13:44:03.356686074 +0200
+@@ -54,7 +54,7 @@
+ <link linkend="GnomeUIInfo">GnomeUIInfo</link> *uiinfo,
+ <link linkend="GtkCallbackMarshal">GtkCallbackMarshal</link> relay_func,
+ <link linkend="gpointer">gpointer</link> data,
+- <link linkend="GtkDestroyNotify">GtkDestroyNotify</link> destroy_func);
++ <link linkend="GDestroyNotify">GDestroyNotify</link> destroy_func);
+ <link linkend="void">void</link> <link linkend="gnome-app-create-menus-with-data">gnome_app_create_menus_with_data</link> (<link linkend="GnomeApp">GnomeApp</link> *app,
+ <link linkend="GnomeUIInfo">GnomeUIInfo</link> *uiinfo,
+ <link linkend="gpointer">gpointer</link> user_data);
+@@ -78,7 +78,7 @@
+ <link linkend="GnomeUIInfo">GnomeUIInfo</link> *uiinfo,
+ <link linkend="GtkCallbackMarshal">GtkCallbackMarshal</link> relay_func,
+ <link linkend="gpointer">gpointer</link> data,
+- <link linkend="GtkDestroyNotify">GtkDestroyNotify</link> destroy_func);
++ <link linkend="GDestroyNotify">GDestroyNotify</link> destroy_func);
+ <link linkend="void">void</link> <link linkend="gnome-app-create-toolbar-with-data">gnome_app_create_toolbar_with_data</link> (<link linkend="GnomeApp">GnomeApp</link> *app,
+ <link linkend="GnomeUIInfo">GnomeUIInfo</link> *uiinfo,
+ <link linkend="gpointer">gpointer</link> user_data);
+@@ -111,7 +111,7 @@
+ <link linkend="GnomeUIInfo">GnomeUIInfo</link> *menuinfo,
+ <link linkend="GtkCallbackMarshal">GtkCallbackMarshal</link> relay_func,
+ <link linkend="gpointer">gpointer</link> data,
+- <link linkend="GtkDestroyNotify">GtkDestroyNotify</link> destroy_func);
++ <link linkend="GDestroyNotify">GDestroyNotify</link> destroy_func);
+ <link linkend="void">void</link> <link linkend="gnome-app-install-appbar-menu-hints">gnome_app_install_appbar_menu_hints</link> (<link linkend="GnomeAppBar">GnomeAppBar</link> *appbar,
+ <link linkend="GnomeUIInfo">GnomeUIInfo</link> *uiinfo);
+ <link linkend="void">void</link> <link linkend="gnome-app-install-statusbar-menu-hints">gnome_app_install_statusbar_menu_hints</link>
+@@ -631,7 +631,7 @@
+ gpointer data;
+ gboolean is_interp;
+ GtkCallbackMarshal relay_func;
+- GtkDestroyNotify destroy_func;
++ GDestroyNotify destroy_func;
+ } GnomeUIBuilderData;
+ </programlisting>
+ <para>
+@@ -666,7 +666,7 @@
+ </simpara></listitem>
+ </varlistentry>
+ <varlistentry>
+-<term><link linkend="GtkDestroyNotify">GtkDestroyNotify</link> <structfield>destroy_func</structfield>;</term>
++<term><link linkend="GDestroyNotify">GDestroyNotify</link> <structfield>destroy_func</structfield>;</term>
+ <listitem><simpara> Destroy notification function for language bindings.
+ </simpara></listitem>
+ </varlistentry>
+@@ -877,7 +877,7 @@
+ <link linkend="GnomeUIInfo">GnomeUIInfo</link> *uiinfo,
+ <link linkend="GtkCallbackMarshal">GtkCallbackMarshal</link> relay_func,
+ <link linkend="gpointer">gpointer</link> data,
+- <link linkend="GtkDestroyNotify">GtkDestroyNotify</link> destroy_func);</programlisting>
++ <link linkend="GDestroyNotify">GDestroyNotify</link> destroy_func);</programlisting>
+ <para>
+ Identical to <link linkend="gnome-app-create-menus"><function>gnome_app_create_menus()</function></link>, except that extra functions and data
+ can be passed in for finer control of the destruction and marshalling.</para>
+@@ -1047,7 +1047,7 @@
+ <link linkend="GnomeUIInfo">GnomeUIInfo</link> *uiinfo,
+ <link linkend="GtkCallbackMarshal">GtkCallbackMarshal</link> relay_func,
+ <link linkend="gpointer">gpointer</link> data,
+- <link linkend="GtkDestroyNotify">GtkDestroyNotify</link> destroy_func);</programlisting>
++ <link linkend="GDestroyNotify">GDestroyNotify</link> destroy_func);</programlisting>
+ <para>
+ Constructs a toolbar and attaches it to the specified application
+ window -- this version is intended for language bindings.</para>
+@@ -1275,7 +1275,7 @@
+ <link linkend="GnomeUIInfo">GnomeUIInfo</link> *menuinfo,
+ <link linkend="GtkCallbackMarshal">GtkCallbackMarshal</link> relay_func,
+ <link linkend="gpointer">gpointer</link> data,
+- <link linkend="GtkDestroyNotify">GtkDestroyNotify</link> destroy_func);</programlisting>
++ <link linkend="GDestroyNotify">GDestroyNotify</link> destroy_func);</programlisting>
+ <para>
+ THe same as <link linkend="gnome-app-insert-menus"><function>gnome_app_insert_menus()</function></link>, except that the given functions are
+ attached to each menu item. Mostly of use for language bindings.</para>
+diff -ur libgnomeui-2.23.4.orig/doc/reference/xml/gnome-client.xml libgnomeui-2.23.4/doc/reference/xml/gnome-client.xml
+--- libgnomeui-2.23.4.orig/doc/reference/xml/gnome-client.xml 2008-08-06 13:35:38.602685873 +0200
++++ libgnomeui-2.23.4/doc/reference/xml/gnome-client.xml 2008-08-06 13:43:05.854696116 +0200
+@@ -103,7 +103,7 @@
+ <link linkend="GnomeDialogType">GnomeDialogType</link> dialog_type,
+ <link linkend="GtkCallbackMarshal">GtkCallbackMarshal</link> function,
+ <link linkend="gpointer">gpointer</link> data,
+- <link linkend="GtkDestroyNotify">GtkDestroyNotify</link> destroy);
++ <link linkend="GDestroyNotify">GDestroyNotify</link> destroy);
+ <link linkend="void">void</link> <link linkend="gnome-interaction-key-return">gnome_interaction_key_return</link> (<link linkend="gint">gint</link> key,
+ <link linkend="gboolean">gboolean</link> cancel_shutdown);
+ </synopsis>
+@@ -1062,7 +1062,7 @@
+ <link linkend="GnomeDialogType">GnomeDialogType</link> dialog_type,
+ <link linkend="GtkCallbackMarshal">GtkCallbackMarshal</link> function,
+ <link linkend="gpointer">gpointer</link> data,
+- <link linkend="GtkDestroyNotify">GtkDestroyNotify</link> destroy);</programlisting>
++ <link linkend="GDestroyNotify">GDestroyNotify</link> destroy);</programlisting>
+ <para>
+ Similar to <link linkend="gnome-client-request-interaction"><function>gnome_client_request_interaction()</function></link>, but used when
+ you need to destroy the callback data after the interaction.</para>
+diff -ur libgnomeui-2.23.4.orig/doc/reference/xml/gnome-mdi-generic-child.xml libgnomeui-2.23.4/doc/reference/xml/gnome-mdi-generic-child.xml
+--- libgnomeui-2.23.4.orig/doc/reference/xml/gnome-mdi-generic-child.xml 2008-08-06 13:35:38.603685915 +0200
++++ libgnomeui-2.23.4/doc/reference/xml/gnome-mdi-generic-child.xml 2008-08-06 13:43:39.084696114 +0200
+@@ -29,7 +29,7 @@
+ <link linkend="GnomeMDIChildViewCreator">GnomeMDIChildViewCreator</link> func,
+ <link linkend="GtkCallbackMarshal">GtkCallbackMarshal</link> marshal,
+ <link linkend="gpointer">gpointer</link> data,
+- <link linkend="GtkDestroyNotify">GtkDestroyNotify</link> notify);
++ <link linkend="GDestroyNotify">GDestroyNotify</link> notify);
+ <link linkend="void">void</link> <link linkend="gnome-mdi-generic-child-set-menu-creator">gnome_mdi_generic_child_set_menu_creator</link>
+ (<link linkend="GnomeMDIGenericChild">GnomeMDIGenericChild</link> *child,
+ <link linkend="GnomeMDIChildMenuCreator">GnomeMDIChildMenuCreator</link> func,
+@@ -39,7 +39,7 @@
+ <link linkend="GnomeMDIChildMenuCreator">GnomeMDIChildMenuCreator</link> func,
+ <link linkend="GtkCallbackMarshal">GtkCallbackMarshal</link> marshal,
+ <link linkend="gpointer">gpointer</link> data,
+- <link linkend="GtkDestroyNotify">GtkDestroyNotify</link> notify);
++ <link linkend="GDestroyNotify">GDestroyNotify</link> notify);
+ <link linkend="void">void</link> <link linkend="gnome-mdi-generic-child-set-config-func">gnome_mdi_generic_child_set_config_func</link>
+ (<link linkend="GnomeMDIGenericChild">GnomeMDIGenericChild</link> *child,
+ <link linkend="GnomeMDIChildConfigFunc">GnomeMDIChildConfigFunc</link> func,
+@@ -49,7 +49,7 @@
+ <link linkend="GnomeMDIChildConfigFunc">GnomeMDIChildConfigFunc</link> func,
+ <link linkend="GtkCallbackMarshal">GtkCallbackMarshal</link> marshal,
+ <link linkend="gpointer">gpointer</link> data,
+- <link linkend="GtkDestroyNotify">GtkDestroyNotify</link> notify);
++ <link linkend="GDestroyNotify">GDestroyNotify</link> notify);
+ <link linkend="void">void</link> <link linkend="gnome-mdi-generic-child-set-label-func">gnome_mdi_generic_child_set_label_func</link>
+ (<link linkend="GnomeMDIGenericChild">GnomeMDIGenericChild</link> *child,
+ <link linkend="GnomeMDIChildLabelFunc">GnomeMDIChildLabelFunc</link> func,
+@@ -59,7 +59,7 @@
+ <link linkend="GnomeMDIChildLabelFunc">GnomeMDIChildLabelFunc</link> func,
+ <link linkend="GtkCallbackMarshal">GtkCallbackMarshal</link> marshal,
+ <link linkend="gpointer">gpointer</link> data,
+- <link linkend="GtkDestroyNotify">GtkDestroyNotify</link> notify);
++ <link linkend="GDestroyNotify">GDestroyNotify</link> notify);
+ </synopsis>
+ </refsynopsisdiv>
+
+@@ -152,7 +152,7 @@
+ <link linkend="GnomeMDIChildViewCreator">GnomeMDIChildViewCreator</link> func,
+ <link linkend="GtkCallbackMarshal">GtkCallbackMarshal</link> marshal,
+ <link linkend="gpointer">gpointer</link> data,
+- <link linkend="GtkDestroyNotify">GtkDestroyNotify</link> notify);</programlisting>
++ <link linkend="GDestroyNotify">GDestroyNotify</link> notify);</programlisting>
+ <warning><para><literal>gnome_mdi_generic_child_set_view_creator_full</literal> is deprecated and should not be used in newly-written code.</para></warning>
+ <para>
+ Similar to <link linkend="gnome-mdi-generic-child-set-view-creator"><function>gnome_mdi_generic_child_set_view_creator()</function></link>, except that it gives
+@@ -215,7 +215,7 @@
+ <link linkend="GnomeMDIChildMenuCreator">GnomeMDIChildMenuCreator</link> func,
+ <link linkend="GtkCallbackMarshal">GtkCallbackMarshal</link> marshal,
+ <link linkend="gpointer">gpointer</link> data,
+- <link linkend="GtkDestroyNotify">GtkDestroyNotify</link> notify);</programlisting>
++ <link linkend="GDestroyNotify">GDestroyNotify</link> notify);</programlisting>
+ <warning><para><literal>gnome_mdi_generic_child_set_menu_creator_full</literal> is deprecated and should not be used in newly-written code.</para></warning>
+ <para>
+ This function is similar to <link linkend="gnome-mdi-generic-child-set-menu-creator"><function>gnome_mdi_generic_child_set_menu_creator()</function></link>,
+@@ -277,7 +277,7 @@
+ <link linkend="GnomeMDIChildConfigFunc">GnomeMDIChildConfigFunc</link> func,
+ <link linkend="GtkCallbackMarshal">GtkCallbackMarshal</link> marshal,
+ <link linkend="gpointer">gpointer</link> data,
+- <link linkend="GtkDestroyNotify">GtkDestroyNotify</link> notify);</programlisting>
++ <link linkend="GDestroyNotify">GDestroyNotify</link> notify);</programlisting>
+ <warning><para><literal>gnome_mdi_generic_child_set_config_func_full</literal> is deprecated and should not be used in newly-written code.</para></warning>
+ <para>
+ A function similar to <link linkend="gnome-mdi-generic-child-set-config-func"><function>gnome_mdi_generic_child_set_config_func()</function></link>, except
+@@ -340,7 +340,7 @@
+ <link linkend="GnomeMDIChildLabelFunc">GnomeMDIChildLabelFunc</link> func,
+ <link linkend="GtkCallbackMarshal">GtkCallbackMarshal</link> marshal,
+ <link linkend="gpointer">gpointer</link> data,
+- <link linkend="GtkDestroyNotify">GtkDestroyNotify</link> notify);</programlisting>
++ <link linkend="GDestroyNotify">GDestroyNotify</link> notify);</programlisting>
+ <warning><para><literal>gnome_mdi_generic_child_set_label_func_full</literal> is deprecated and should not be used in newly-written code.</para></warning>
+ <para>
+ Similar to <link linkend="gnome-mdi-generic-child-set-label-func"><function>gnome_mdi_generic_child_set_label_func()</function></link>, except it gives more
================================================================
Index: SOURCES/libgnomeui-gtype.patch
diff -u /dev/null SOURCES/libgnomeui-gtype.patch:1.1
--- /dev/null Wed Aug 6 14:28:23 2008
+++ SOURCES/libgnomeui-gtype.patch Wed Aug 6 14:28:16 2008
@@ -0,0 +1,592 @@
+diff -ur libgnomeui-2.23.4/libgnomeui/gnome-appbar.h libgnomeui-2.23.4.new/libgnomeui/gnome-appbar.h
+--- libgnomeui-2.23.4/libgnomeui/gnome-appbar.h 2008-05-29 18:37:08.000000000 +0200
++++ libgnomeui-2.23.4.new/libgnomeui/gnome-appbar.h 2008-08-06 14:10:58.577685811 +0200
+@@ -37,11 +37,11 @@
+ G_BEGIN_DECLS
+
+ #define GNOME_TYPE_APPBAR (gnome_appbar_get_type ())
+-#define GNOME_APPBAR(obj) (GTK_CHECK_CAST ((obj), GNOME_TYPE_APPBAR, GnomeAppBar))
+-#define GNOME_APPBAR_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GNOME_TYPE_APPBAR, GnomeAppBarClass))
+-#define GNOME_IS_APPBAR(obj) (GTK_CHECK_TYPE ((obj), GNOME_TYPE_APPBAR))
+-#define GNOME_IS_APPBAR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_APPBAR))
+-#define GNOME_APPBAR_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GNOME_TYPE_APPBAR, GnomeAppBarClass))
++#define GNOME_APPBAR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_APPBAR, GnomeAppBar))
++#define GNOME_APPBAR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_APPBAR, GnomeAppBarClass))
++#define GNOME_IS_APPBAR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_APPBAR))
++#define GNOME_IS_APPBAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_APPBAR))
++#define GNOME_APPBAR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_TYPE_APPBAR, GnomeAppBarClass))
+
+ /* Used in gnome-app-util to determine the capabilities of the appbar */
+ #define GNOME_APPBAR_HAS_STATUS(appbar) (gnome_appbar_get_status(GNOME_APPBAR(appbar)) != NULL)
+diff -ur libgnomeui-2.23.4/libgnomeui/gnome-app.h libgnomeui-2.23.4.new/libgnomeui/gnome-app.h
+--- libgnomeui-2.23.4/libgnomeui/gnome-app.h 2008-05-29 18:37:08.000000000 +0200
++++ libgnomeui-2.23.4.new/libgnomeui/gnome-app.h 2008-08-06 14:10:58.578685620 +0200
+@@ -50,11 +50,11 @@
+
+
+ #define GNOME_TYPE_APP (gnome_app_get_type ())
+-#define GNOME_APP(obj) (GTK_CHECK_CAST ((obj), GNOME_TYPE_APP, GnomeApp))
+-#define GNOME_APP_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GNOME_TYPE_APP, GnomeAppClass))
+-#define GNOME_IS_APP(obj) (GTK_CHECK_TYPE ((obj), GNOME_TYPE_APP))
+-#define GNOME_IS_APP_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_APP))
+-#define GNOME_APP_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GNOME_TYPE_APP, GnomeAppClass))
++#define GNOME_APP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_APP, GnomeApp))
++#define GNOME_APP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_APP, GnomeAppClass))
++#define GNOME_IS_APP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_APP))
++#define GNOME_IS_APP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_APP))
++#define GNOME_APP_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_TYPE_APP, GnomeAppClass))
+
+
+ typedef struct _GnomeApp GnomeApp;
+diff -ur libgnomeui-2.23.4/libgnomeui/gnome-client.h libgnomeui-2.23.4.new/libgnomeui/gnome-client.h
+--- libgnomeui-2.23.4/libgnomeui/gnome-client.h 2008-08-06 14:14:06.080685705 +0200
++++ libgnomeui-2.23.4.new/libgnomeui/gnome-client.h 2008-08-06 14:10:58.590685608 +0200
+@@ -36,11 +36,11 @@
+ G_BEGIN_DECLS
+
+ #define GNOME_TYPE_CLIENT (gnome_client_get_type ())
+-#define GNOME_CLIENT(obj) (GTK_CHECK_CAST ((obj), GNOME_TYPE_CLIENT, GnomeClient))
+-#define GNOME_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GNOME_TYPE_CLIENT, GnomeClientClass))
+-#define GNOME_IS_CLIENT(obj) (GTK_CHECK_TYPE ((obj), GNOME_TYPE_CLIENT))
+-#define GNOME_IS_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE (((klass), GNOME_TYPE_CLIENT))
+-#define GNOME_CLIENT_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GNOME_TYPE_CLIENT, GnomeClientClass))
++#define GNOME_CLIENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_CLIENT, GnomeClient))
++#define GNOME_CLIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_CLIENT, GnomeClientClass))
++#define GNOME_IS_CLIENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_CLIENT))
++#define GNOME_IS_CLIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE (((klass), GNOME_TYPE_CLIENT))
++#define GNOME_CLIENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_TYPE_CLIENT, GnomeClientClass))
+
+ #define GNOME_CLIENT_CONNECTED(obj) (GNOME_CLIENT (obj)->smc_conn)
+
+diff -ur libgnomeui-2.23.4/libgnomeui/gnome-color-picker.h libgnomeui-2.23.4.new/libgnomeui/gnome-color-picker.h
+--- libgnomeui-2.23.4/libgnomeui/gnome-color-picker.h 2008-05-29 18:37:09.000000000 +0200
++++ libgnomeui-2.23.4.new/libgnomeui/gnome-color-picker.h 2008-08-06 14:10:58.591685597 +0200
+@@ -46,11 +46,11 @@
+ */
+
+ #define GNOME_TYPE_COLOR_PICKER (gnome_color_picker_get_type ())
+-#define GNOME_COLOR_PICKER(obj) (GTK_CHECK_CAST ((obj), GNOME_TYPE_COLOR_PICKER, GnomeColorPicker))
+-#define GNOME_COLOR_PICKER_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GNOME_TYPE_COLOR_PICKER, GnomeColorPickerClass))
+-#define GNOME_IS_COLOR_PICKER(obj) (GTK_CHECK_TYPE ((obj), GNOME_TYPE_COLOR_PICKER))
+-#define GNOME_IS_COLOR_PICKER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_COLOR_PICKER))
+-#define GNOME_COLOR_PICKER_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GNOME_TYPE_COLOR_PICKER, GnomeColorPickerClass))
++#define GNOME_COLOR_PICKER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_COLOR_PICKER, GnomeColorPicker))
++#define GNOME_COLOR_PICKER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_COLOR_PICKER, GnomeColorPickerClass))
++#define GNOME_IS_COLOR_PICKER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_COLOR_PICKER))
++#define GNOME_IS_COLOR_PICKER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_COLOR_PICKER))
++#define GNOME_COLOR_PICKER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_TYPE_COLOR_PICKER, GnomeColorPickerClass))
+
+
+ typedef struct _GnomeColorPicker GnomeColorPicker;
+diff -ur libgnomeui-2.23.4/libgnomeui/gnome-dateedit.c libgnomeui-2.23.4.new/libgnomeui/gnome-dateedit.c
+--- libgnomeui-2.23.4/libgnomeui/gnome-dateedit.c 2008-05-29 18:37:09.000000000 +0200
++++ libgnomeui-2.23.4.new/libgnomeui/gnome-dateedit.c 2008-08-06 14:12:03.018695975 +0200
+@@ -120,7 +120,7 @@
+ /**
+ * gnome_date_edit_get_type:
+ *
+- * Returns the GtkType for the GnomeDateEdit widget
++ * Returns the GType for the GnomeDateEdit widget
+ */
+ /* The following macro defines the get_type */
+ GNOME_CLASS_BOILERPLATE(GnomeDateEdit, gnome_date_edit,
+diff -ur libgnomeui-2.23.4/libgnomeui/gnome-dateedit.h libgnomeui-2.23.4.new/libgnomeui/gnome-dateedit.h
+--- libgnomeui-2.23.4/libgnomeui/gnome-dateedit.h 2008-05-29 18:37:09.000000000 +0200
++++ libgnomeui-2.23.4.new/libgnomeui/gnome-dateedit.h 2008-08-06 14:10:58.592685583 +0200
+@@ -42,11 +42,11 @@
+
+
+ #define GNOME_TYPE_DATE_EDIT (gnome_date_edit_get_type ())
+-#define GNOME_DATE_EDIT(obj) (GTK_CHECK_CAST ((obj), GNOME_TYPE_DATE_EDIT, GnomeDateEdit))
+-#define GNOME_DATE_EDIT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GNOME_TYPE_DATE_EDIT, GnomeDateEditClass))
+-#define GNOME_IS_DATE_EDIT(obj) (GTK_CHECK_TYPE ((obj), GNOME_TYPE_DATE_EDIT))
+-#define GNOME_IS_DATE_EDIT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_DATE_EDIT))
+-#define GNOME_DATE_EDIT_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GNOME_TYPE_DATE_EDIT, GnomeDateEditClass))
++#define GNOME_DATE_EDIT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_DATE_EDIT, GnomeDateEdit))
++#define GNOME_DATE_EDIT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_DATE_EDIT, GnomeDateEditClass))
++#define GNOME_IS_DATE_EDIT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_DATE_EDIT))
++#define GNOME_IS_DATE_EDIT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_DATE_EDIT))
++#define GNOME_DATE_EDIT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_TYPE_DATE_EDIT, GnomeDateEditClass))
+
+ typedef struct _GnomeDateEdit GnomeDateEdit;
+ typedef struct _GnomeDateEditPrivate GnomeDateEditPrivate;
+diff -ur libgnomeui-2.23.4/libgnomeui/gnome-dialog.h libgnomeui-2.23.4.new/libgnomeui/gnome-dialog.h
+--- libgnomeui-2.23.4/libgnomeui/gnome-dialog.h 2008-05-29 18:37:09.000000000 +0200
++++ libgnomeui-2.23.4.new/libgnomeui/gnome-dialog.h 2008-08-06 14:10:58.593685572 +0200
+@@ -36,11 +36,11 @@
+ G_BEGIN_DECLS
+
+ #define GNOME_TYPE_DIALOG (gnome_dialog_get_type ())
+-#define GNOME_DIALOG(obj) (GTK_CHECK_CAST ((obj), GNOME_TYPE_DIALOG, GnomeDialog))
+-#define GNOME_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GNOME_TYPE_DIALOG, GnomeDialogClass))
+-#define GNOME_IS_DIALOG(obj) (GTK_CHECK_TYPE ((obj), GNOME_TYPE_DIALOG))
+-#define GNOME_IS_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_DIALOG))
+-#define GNOME_DIALOG_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GNOME_TYPE_DIALOG, GnomeDialogClass))
++#define GNOME_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_DIALOG, GnomeDialog))
++#define GNOME_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_DIALOG, GnomeDialogClass))
++#define GNOME_IS_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_DIALOG))
++#define GNOME_IS_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_DIALOG))
++#define GNOME_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_TYPE_DIALOG, GnomeDialogClass))
+
+ typedef struct _GnomeDialog GnomeDialog;
+ typedef struct _GnomeDialogClass GnomeDialogClass;
+diff -ur libgnomeui-2.23.4/libgnomeui/gnome-druid.c libgnomeui-2.23.4.new/libgnomeui/gnome-druid.c
+--- libgnomeui-2.23.4/libgnomeui/gnome-druid.c 2008-05-29 18:37:09.000000000 +0200
++++ libgnomeui-2.23.4.new/libgnomeui/gnome-druid.c 2008-08-06 14:11:51.354685901 +0200
+@@ -71,7 +71,7 @@
+ GdkEventExpose *event);
+ static void gnome_druid_map (GtkWidget *widget);
+ static void gnome_druid_unmap (GtkWidget *widget);
+-static GtkType gnome_druid_child_type (GtkContainer *container);
++static GType gnome_druid_child_type (GtkContainer *container);
+ static void gnome_druid_add (GtkContainer *widget,
+ GtkWidget *page);
+ static void gnome_druid_remove (GtkContainer *widget,
+@@ -479,7 +479,7 @@
+ }
+ }
+
+-static GtkType
++static GType
+ gnome_druid_child_type (GtkContainer *container)
+ {
+ return GNOME_TYPE_DRUID_PAGE;
+diff -ur libgnomeui-2.23.4/libgnomeui/gnome-druid.h libgnomeui-2.23.4.new/libgnomeui/gnome-druid.h
+--- libgnomeui-2.23.4/libgnomeui/gnome-druid.h 2008-05-29 18:37:09.000000000 +0200
++++ libgnomeui-2.23.4.new/libgnomeui/gnome-druid.h 2008-08-06 14:10:58.595685848 +0200
+@@ -33,11 +33,11 @@
+ G_BEGIN_DECLS
+
+ #define GNOME_TYPE_DRUID (gnome_druid_get_type ())
+-#define GNOME_DRUID(obj) (GTK_CHECK_CAST ((obj), GNOME_TYPE_DRUID, GnomeDruid))
+-#define GNOME_DRUID_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GNOME_TYPE_DRUID, GnomeDruidClass))
+-#define GNOME_IS_DRUID(obj) (GTK_CHECK_TYPE ((obj), GNOME_TYPE_DRUID))
+-#define GNOME_IS_DRUID_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_DRUID))
+-#define GNOME_DRUID_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GNOME_TYPE_DRUID, GnomeDruidClass))
++#define GNOME_DRUID(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_DRUID, GnomeDruid))
++#define GNOME_DRUID_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_DRUID, GnomeDruidClass))
++#define GNOME_IS_DRUID(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_DRUID))
++#define GNOME_IS_DRUID_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_DRUID))
++#define GNOME_DRUID_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_TYPE_DRUID, GnomeDruidClass))
+
+
+ typedef struct _GnomeDruid GnomeDruid;
+diff -ur libgnomeui-2.23.4/libgnomeui/gnome-druid-page-edge.h libgnomeui-2.23.4.new/libgnomeui/gnome-druid-page-edge.h
+--- libgnomeui-2.23.4/libgnomeui/gnome-druid-page-edge.h 2008-05-29 18:37:09.000000000 +0200
++++ libgnomeui-2.23.4.new/libgnomeui/gnome-druid-page-edge.h 2008-08-06 14:10:58.596685679 +0200
+@@ -33,11 +33,11 @@
+ G_BEGIN_DECLS
+
+ #define GNOME_TYPE_DRUID_PAGE_EDGE (gnome_druid_page_edge_get_type ())
+-#define GNOME_DRUID_PAGE_EDGE(obj) (GTK_CHECK_CAST ((obj), GNOME_TYPE_DRUID_PAGE_EDGE, GnomeDruidPageEdge))
+-#define GNOME_DRUID_PAGE_EDGE_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GNOME_TYPE_DRUID_PAGE_EDGE, GnomeDruidPageEdgeClass))
+-#define GNOME_IS_DRUID_PAGE_EDGE(obj) (GTK_CHECK_TYPE ((obj), GNOME_TYPE_DRUID_PAGE_EDGE))
+-#define GNOME_IS_DRUID_PAGE_EDGE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_DRUID_PAGE_EDGE))
+-#define GNOME_DRUID_PAGE_EDGE_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GNOME_TYPE_DRUID_PAGE_EDGE, GnomeDruidPageEdgeClass))
++#define GNOME_DRUID_PAGE_EDGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_DRUID_PAGE_EDGE, GnomeDruidPageEdge))
++#define GNOME_DRUID_PAGE_EDGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_DRUID_PAGE_EDGE, GnomeDruidPageEdgeClass))
++#define GNOME_IS_DRUID_PAGE_EDGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_DRUID_PAGE_EDGE))
++#define GNOME_IS_DRUID_PAGE_EDGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_DRUID_PAGE_EDGE))
++#define GNOME_DRUID_PAGE_EDGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_TYPE_DRUID_PAGE_EDGE, GnomeDruidPageEdgeClass))
+
+ /**
+ * GnomeEdgePosition:
+diff -ur libgnomeui-2.23.4/libgnomeui/gnome-druid-page.h libgnomeui-2.23.4.new/libgnomeui/gnome-druid-page.h
+--- libgnomeui-2.23.4/libgnomeui/gnome-druid-page.h 2008-05-29 18:37:09.000000000 +0200
++++ libgnomeui-2.23.4.new/libgnomeui/gnome-druid-page.h 2008-08-06 14:10:58.597685571 +0200
+@@ -32,11 +32,11 @@
+ G_BEGIN_DECLS
<<Diff was trimmed, longer than 597 lines>>
More information about the pld-cvs-commit
mailing list