Re: namespace checking

[Havoc Pennington <hp redhat com>]

Havoc Pennington <hp redhat com> writes: 
> Appended is the libgnomeui patch, OK to commit?

Well, no, because my patch was totally braindamaged. Let's try that
again.

Havoc

Index: libgnomeui/ChangeLog
===================================================================
RCS file: /cvs/gnome/libgnomeui/libgnomeui/ChangeLog,v
retrieving revision 1.1687
diff -u -p -u -r1.1687 ChangeLog
--- libgnomeui/ChangeLog	2001/10/04 02:44:54	1.1687
+++ libgnomeui/ChangeLog	2001/10/10 19:57:19
@@ -1,3 +1,17 @@
+2001-10-10  Havoc Pennington  <hp redhat com>
+
+	 Fix output of:
+	 nm -g -l .libs/libgnomeui-2.so | grep ' T ' | grep -v ' gnome_' |
+	 grep -v ' GNOME_'
+	
+	* gnome-stock-icons.c (gnome_stock_icons_init): renamed from 
+	init_gnome_stock_icons, to be in the right namespace.	
+	
+	* gnome-mdi.c (child_list_menu_remove_item):
+	(child_list_menu_add_item): rename with gnome_mdi prefix
+
+	* gnome-mdi-child.c: fixes for renames
+	
 2001-10-04  James Henstridge  <james daa com au>
 
 	* gnome-icon-list.c (gnome_icon_list_class_init): change second
Index: libgnomeui/gnome-mdi-child.c
===================================================================
RCS file: /cvs/gnome/libgnomeui/libgnomeui/gnome-mdi-child.c,v
retrieving revision 1.39
diff -u -p -u -r1.39 gnome-mdi-child.c
--- libgnomeui/gnome-mdi-child.c	2001/09/14 19:33:18	1.39
+++ libgnomeui/gnome-mdi-child.c	2001/10/10 19:57:19
@@ -45,8 +45,8 @@ static GtkWidget *gnome_mdi_child_set_la
 static GtkWidget *gnome_mdi_child_create_view      (GnomeMDIChild *);
 
 /* declare the functions from gnome-mdi.c that we need but are not public */
-void child_list_menu_remove_item (GnomeMDI *, GnomeMDIChild *);
-void child_list_menu_add_item    (GnomeMDI *, GnomeMDIChild *);
+void gnome_mdi_child_list_menu_remove_item (GnomeMDI *, GnomeMDIChild *);
+void gnome_mdi_child_list_menu_add_item    (GnomeMDI *, GnomeMDIChild *);
 
 GNOME_CLASS_BOILERPLATE (GnomeMDIChild, gnome_mdi_child,
 			 GtkObject, gtk_object, GTK_TYPE_OBJECT)
@@ -194,7 +194,7 @@ void gnome_mdi_child_set_name(GnomeMDICh
 	gchar *old_name = mdi_child->name;
 
 	if(mdi_child->parent)
-		child_list_menu_remove_item(GNOME_MDI(mdi_child->parent), mdi_child);
+		gnome_mdi_child_list_menu_remove_item(GNOME_MDI(mdi_child->parent), mdi_child);
 
 	mdi_child->name = (gchar *)g_strdup(name);
 
@@ -202,7 +202,7 @@ void gnome_mdi_child_set_name(GnomeMDICh
 		g_free(old_name);
 
 	if(mdi_child->parent) {
-		child_list_menu_add_item(GNOME_MDI(mdi_child->parent), mdi_child);
+		gnome_mdi_child_list_menu_add_item(GNOME_MDI(mdi_child->parent), mdi_child);
 		gnome_mdi_update_child(GNOME_MDI(mdi_child->parent), mdi_child);
 	}
 }
Index: libgnomeui/gnome-mdi.c
===================================================================
RCS file: /cvs/gnome/libgnomeui/libgnomeui/gnome-mdi.c,v
retrieving revision 1.119
diff -u -p -u -r1.119 gnome-mdi.c
--- libgnomeui/gnome-mdi.c	2001/09/14 19:33:18	1.119
+++ libgnomeui/gnome-mdi.c	2001/10/10 19:57:19
@@ -49,9 +49,9 @@ static void            gnome_mdi_finaliz
 
 static void            child_list_menu_create     (GnomeMDI *, GnomeApp *);
 static void            child_list_activated_cb    (GtkWidget *, GnomeMDI *);
-void                   child_list_menu_remove_item(GnomeMDI *, GnomeMDIChild *);
-void                   child_list_menu_add_item   (GnomeMDI *, GnomeMDIChild *);
-static GtkWidget       *find_item_by_child        (GtkMenuShell *, GnomeMDIChild *);
+void                   gnome_mdi_child_list_menu_remove_item(GnomeMDI *, GnomeMDIChild *);
+void                   gnome_mdi_child_list_menu_add_item   (GnomeMDI *, GnomeMDIChild *);
+static GtkWidget      *find_item_by_child        (GtkMenuShell *, GnomeMDIChild *);
 
 static void            app_create               (GnomeMDI *, gchar *);
 static void            app_clone                (GnomeMDI *, GnomeApp *);
@@ -429,7 +429,8 @@ static void child_list_menu_create (Gnom
 	gtk_widget_queue_resize(submenu);
 }
 
-void child_list_menu_remove_item (GnomeMDI *mdi, GnomeMDIChild *child)
+void
+gnome_mdi_child_list_menu_remove_item (GnomeMDI *mdi, GnomeMDIChild *child)
 {
 	GtkWidget *item, *shell;
 	GnomeApp *app;
@@ -458,7 +459,8 @@ void child_list_menu_remove_item (GnomeM
 	}
 }
 
-void child_list_menu_add_item (GnomeMDI *mdi, GnomeMDIChild *child)
+void
+gnome_mdi_child_list_menu_add_item (GnomeMDI *mdi, GnomeMDIChild *child)
 {
 	GtkWidget *item, *submenu, *label;
 	GnomeApp *app;
@@ -1380,7 +1382,7 @@ gint gnome_mdi_add_child (GnomeMDI *mdi,
 
 	mdi->children = g_list_append(mdi->children, child);
 
-	child_list_menu_add_item(mdi, child);
+	gnome_mdi_child_list_menu_add_item(mdi, child);
 
 	return TRUE;
 }
@@ -1428,7 +1430,7 @@ gint gnome_mdi_remove_child (GnomeMDI *m
 
 	mdi->children = g_list_remove(mdi->children, child);
 
-	child_list_menu_remove_item(mdi, child);
+	gnome_mdi_child_list_menu_remove_item(mdi, child);
 
 	if(child == mdi->active_child)
 		mdi->active_child = NULL;
Index: libgnomeui/gnome-stock-icons.c
===================================================================
RCS file: /cvs/gnome/libgnomeui/libgnomeui/gnome-stock-icons.c,v
retrieving revision 1.14
diff -u -p -u -r1.14 gnome-stock-icons.c
--- libgnomeui/gnome-stock-icons.c	2001/09/14 19:33:18	1.14
+++ libgnomeui/gnome-stock-icons.c	2001/10/10 19:57:19
@@ -143,7 +143,7 @@ static GtkStockItem builtin_items [] =
 };
 
 void
-init_gnome_stock_icons (void)
+gnome_stock_icons_init (void)
 {
     static gboolean initialized = FALSE;
     GtkIconFactory *factory;
Index: libgnomeui/gnome-stock-icons.h
===================================================================
RCS file: /cvs/gnome/libgnomeui/libgnomeui/gnome-stock-icons.h,v
retrieving revision 1.7
diff -u -p -u -r1.7 gnome-stock-icons.h
--- libgnomeui/gnome-stock-icons.h	2001/09/11 08:04:58	1.7
+++ libgnomeui/gnome-stock-icons.h	2001/10/10 19:57:19
@@ -31,7 +31,7 @@
 
 G_BEGIN_DECLS
 
-extern void init_gnome_stock_icons (void);
+extern void gnome_stock_icons_init (void);
 
 #define GNOME_STOCK_TIMER "gnome-stock-timer"
 #define GNOME_STOCK_TIMER_STOP "gnome-stock-timer-stop"
Index: libgnomeui/gnome-ui-init.c
===================================================================
RCS file: /cvs/gnome/libgnomeui/libgnomeui/gnome-ui-init.c,v
retrieving revision 1.157
diff -u -p -u -r1.157 gnome-ui-init.c
--- libgnomeui/gnome-ui-init.c	2001/09/19 19:17:36	1.157
+++ libgnomeui/gnome-ui-init.c	2001/10/10 19:57:19
@@ -302,7 +302,7 @@ libgnomeui_post_args_parse(GnomeProgram 
         priv = g_object_get_qdata(G_OBJECT(program), quark_gnome_program_private_libgnomeui);
         priv->constructed = TRUE;
 
-        init_gnome_stock_icons ();
+        gnome_stock_icons_init ();
 }
 
 static void