[Gnucash-changes] r13419 - gnucash/trunk - Remove a unused function that calls deprecated gnome routines.

[David Hampton]

Author: hampton
Date: 2006-02-28 00:18:34 -0500 (Tue, 28 Feb 2006)
New Revision: 13419
Trac: http://svn.gnucash.org/trac/changeset/13419

Modified:
   gnucash/trunk/ChangeLog
   gnucash/trunk/src/gnome-utils/dialog-utils.c
   gnucash/trunk/src/gnome-utils/dialog-utils.h
Log:
Remove a unused function that calls deprecated gnome routines.


Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog	2006-02-28 02:45:36 UTC (rev 13418)
+++ gnucash/trunk/ChangeLog	2006-02-28 05:18:34 UTC (rev 13419)
@@ -1,5 +1,8 @@
 2006-02-27  David Hampton  <hampton at employees.org>
 
+	* src/gnome-utils/dialog-utils.[ch]: Remove a unused function that
+	calls deprecated gnome routines.
+
 	* src/gnome/window-reconcile.c:
 	* src/gnome/ui/gnc-reconcile-window-ui.xml:
 	* src/gnome/ui/Makefile.am: Convert the reconcile window from the

Modified: gnucash/trunk/src/gnome-utils/dialog-utils.c
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-utils.c	2006-02-28 02:45:36 UTC (rev 13418)
+++ gnucash/trunk/src/gnome-utils/dialog-utils.c	2006-02-28 05:18:34 UTC (rev 13419)
@@ -27,8 +27,10 @@
 
 #include "config.h"
 
-#include <gnome.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
 #include "glib-compat.h"
+#include <glib/gi18n.h>
 #include <glade/glade.h>
 #include <gmodule.h>
 #include <dlfcn.h>
@@ -165,7 +167,7 @@
     return GTK_TOOLBAR_BOTH;
   tbstyle = gnc_enum_from_nick(GTK_TYPE_TOOLBAR_STYLE, style_string,
 			       GTK_TOOLBAR_BOTH);
-  free(style_string);
+  g_free(style_string);
 
   return tbstyle;
 }
@@ -311,43 +313,7 @@
 }
 
 
-/********************************************************************\
- * gnc_fill_menu_with_data                                          *
- *   fill the user data values in the menu structure with the given *
- *   value. The filling is done recursively.                        *
- *                                                                  *
- * Args: info - the menu to fill                                    *
- *       data - the value to fill with                              *
- * Returns: nothing                                                 *
-\********************************************************************/
 void
-gnc_fill_menu_with_data(GnomeUIInfo *info, gpointer data)
-{
-  if (info == NULL)
-    return;
-
-  while (1)
-  {
-    switch (info->type)
-    {
-      case GNOME_APP_UI_RADIOITEMS:
-      case GNOME_APP_UI_SUBTREE:
-      case GNOME_APP_UI_SUBTREE_STOCK:
-        gnc_fill_menu_with_data((GnomeUIInfo *) info->moreinfo, data);
-        break;
-      case GNOME_APP_UI_ENDOFINFO:
-        return;
-      default:
-        info->user_data = data;
-        break;
-    }
-
-    info++;
-  }
-}
-
-
-void
 gnc_option_menu_init(GtkWidget * w)
 {
   GtkWidget * menu;

Modified: gnucash/trunk/src/gnome-utils/dialog-utils.h
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-utils.h	2006-02-28 02:45:36 UTC (rev 13418)
+++ gnucash/trunk/src/gnome-utils/dialog-utils.h	2006-02-28 05:18:34 UTC (rev 13419)
@@ -83,18 +83,6 @@
 void gnc_save_window_size (const char *section, GtkWindow *window);
 
 
-/********************************************************************\
- * Fill the user data values in the menu structure with the given   *
- * value. The filling is done recursively.                          *
- *                                                                  *
- * Args: info - the menu to fill                                    *
- *       data - the value to fill with                              *
- * Returns: nothing                                                 *
-\********************************************************************/
-#ifdef LIBGNOME_H
-void gnc_fill_menu_with_data (GnomeUIInfo *info, gpointer data);
-#endif
-
 void gnc_option_menu_init (GtkWidget * option_menu);
 void gnc_option_menu_init_w_signal(GtkWidget * w,
 				   GCallback f,