Replaced all deprecated methods except 2 GtkCTree instances with gnome-2

alternatives.

4 files changed, 66 insertions, 15 deletions

diff --git a/control-center/ChangeLog b/control-center/ChangeLog
index bc33bef77..5230131eb 100644
--- a/control-center/ChangeLog
+++ b/control-center/ChangeLog
@@ -1,3 +1,16 @@
+2002-02-12  Lauris Kaplinski  <lauris@ximian.com>
+
+	* preferences.c (prefs_dialog_ok_cb): Destroy widget instead of
+	gnome_dialog_close
+	(prefs_dialog_cancel_cb): Ditto
+	(prefs_dialog_response): Common button click handler
+	(gnomecc_preferences_get_config_dialog): Connect GtkDialog 'response' signal
+
+	* capplet-dir-view.c (capplet_dir_view_load_dir): Replace deprecated methods,
+	use gdk_pixbuf/gtk_image instead of gnome_pixmap
+	(prefs_changed_cb): Use g_object_set
+	(option_menu_activate): Use g_object_set_data
+
 2002-02-08  Richard Hestilow  <hestilow@ximian.com>
 	
 	* main.c (main): Ignore nautilus if run with --use-shell.
diff --git a/control-center/capplet-dir-view-tree.c b/control-center/capplet-dir-view-tree.c
index 241bf7beb..c0b34d658 100644
--- a/control-center/capplet-dir-view-tree.c
+++ b/control-center/capplet-dir-view-tree.c
@@ -22,6 +22,10 @@
  * 02111-1307, USA.
  */
 
+#ifdef GTK_DISABLE_DEPRECATED
+#undef GTK_DISABLE_DEPRECATED
+#endif
+
 #include <config.h>
 
 #include "capplet-dir-view.h"
diff --git a/control-center/capplet-dir-view.c b/control-center/capplet-dir-view.c
index 3862bcabc..65530387c 100644
--- a/control-center/capplet-dir-view.c
+++ b/control-center/capplet-dir-view.c
@@ -414,7 +414,7 @@ option_menu_activate (GtkWidget *w, CappletDirEntry *entry)
 {
 	CappletDirView *view;
 
-	view = gtk_object_get_user_data (GTK_OBJECT (w));
+	view = g_object_get_data (G_OBJECT (w), "user_data");
 	if (!IS_CAPPLET_DIR_VIEW (view))
 		return;
 
@@ -449,10 +449,20 @@ capplet_dir_view_load_dir (CappletDirView *view, CappletDir *dir)
 	menu = gtk_menu_new ();
 
 	for (entry = CAPPLET_DIR_ENTRY (dir); entry; entry = CAPPLET_DIR_ENTRY (entry->dir), parents++) {
+		GdkPixbuf *pb, *pbs;
+
 		menuitem = gtk_menu_item_new ();
 		hbox = gtk_hbox_new (FALSE, GNOME_PAD_SMALL);
 
+#if 0
 		w = gnome_pixmap_new_from_file_at_size (entry->icon, 16, 16);
+#else
+		pb = gdk_pixbuf_new_from_file (entry->icon, NULL);
+		pbs = gdk_pixbuf_scale_simple (pb, 16, 16, GDK_INTERP_HYPER);
+		w = gtk_image_new_from_pixbuf (pb);
+		g_object_unref (pbs);
+		g_object_unref (pb);
+#endif
 		gtk_box_pack_start (GTK_BOX (hbox), w,
 				    FALSE, FALSE, 0);
 
@@ -463,13 +473,13 @@ capplet_dir_view_load_dir (CappletDirView *view, CappletDir *dir)
 		gtk_container_add (GTK_CONTAINER (menuitem), hbox);
 
 		if (entry != CAPPLET_DIR_ENTRY (dir)) {
-			gtk_object_set_user_data (GTK_OBJECT (menuitem), view);
-			gtk_signal_connect (GTK_OBJECT (menuitem), "activate",
-					    GTK_SIGNAL_FUNC (option_menu_activate),
-					    entry);
+			g_object_set_data (G_OBJECT (menuitem), "user_data", view);
+			g_signal_connect (G_OBJECT (menuitem), "activate",
+					  (GCallback) option_menu_activate,
+					  entry);
 		}
 		
-		gtk_menu_prepend (GTK_MENU (menu), menuitem);
+		gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menuitem);
 	}
 	gtk_widget_show_all (menu);
 }
@@ -516,7 +526,7 @@ prefs_changed_cb (GnomeCCPreferences *prefs)
 	GList *node;
 
 	for (node = window_list; node; node = node->next)
-		gtk_object_set (GTK_OBJECT (node->data), "layout", prefs->layout, NULL);
+		g_object_set (G_OBJECT (node->data), "layout", prefs->layout, NULL);
 }
 
 void
diff --git a/control-center/preferences.c b/control-center/preferences.c
index 1c8c07d93..4ccd78e37 100644
--- a/control-center/preferences.c
+++ b/control-center/preferences.c
@@ -233,7 +233,7 @@ prefs_dialog_ok_cb (GtkWidget *widget, GladeXML *data)
 
 	prefs = g_object_get_data (G_OBJECT (data), "prefs_struct");
 	read_preferences (data, prefs);
-	gnome_dialog_close (GNOME_DIALOG (prefs_dialog));
+	gtk_widget_destroy (GTK_WIDGET (prefs_dialog));
 	prefs_dialog = NULL;
 	prefs_dialog_data = NULL;
 }
@@ -243,7 +243,7 @@ prefs_dialog_apply_cb (GtkWidget *widget, GladeXML *data)
 {
 	GnomeCCPreferences *prefs;
 
-	prefs = gtk_object_get_data (GTK_OBJECT (data), "prefs_struct");
+	prefs = g_object_get_data (G_OBJECT (data), "prefs_struct");
 	read_preferences (data, prefs);
 }
 
@@ -252,12 +252,12 @@ prefs_dialog_cancel_cb (GtkWidget *widget, GladeXML *data)
 {
 	GnomeCCPreferences *prefs;
 
-	prefs = gtk_object_get_data (GTK_OBJECT (data), "prefs_struct");
+	prefs = g_object_get_data (G_OBJECT (data), "prefs_struct");
 	gnomecc_preferences_copy (prefs, old_prefs);
-	gtk_signal_emit (GTK_OBJECT (prefs),
-			 gnomecc_preferences_signals[CHANGED_SIGNAL]);
+	g_signal_emit (GTK_OBJECT (prefs),
+		       gnomecc_preferences_signals[CHANGED_SIGNAL], 0);
 
-	gnome_dialog_close (GNOME_DIALOG (prefs_dialog));
+	gtk_widget_destroy (GTK_WIDGET (prefs_dialog));
 	prefs_dialog = NULL;
 	prefs_dialog_data = NULL;
 }
@@ -283,6 +283,25 @@ tree_widget_toggled_cb (GtkWidget *widget)
 		 !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)));
 }
 
+static void
+prefs_dialog_response (GtkWidget *widget, gint id, GladeXML *data)
+{
+	switch (id) {
+	case GTK_RESPONSE_OK:
+		prefs_dialog_ok_cb (widget, data);
+		break;
+	case GTK_RESPONSE_APPLY:
+		prefs_dialog_apply_cb (widget, data);
+		break;
+	case GTK_RESPONSE_CANCEL:
+		prefs_dialog_cancel_cb (widget, data);
+		break;
+	default:
+		g_warning ("file %s: line %d: Unknown response id %d", __FILE__, __LINE__, id);
+		break;
+	}
+}
+
 GtkWidget *
 gnomecc_preferences_get_config_dialog (GnomeCCPreferences *prefs) 
 {
@@ -304,6 +323,7 @@ gnomecc_preferences_get_config_dialog (GnomeCCPreferences *prefs)
 	prefs_dialog = glade_xml_get_widget (prefs_dialog_data, 
 					     "preferences_dialog");
 
+#if 0
 	gnome_dialog_button_connect
 		(GNOME_DIALOG (prefs_dialog), 0,
 		 GTK_SIGNAL_FUNC (prefs_dialog_ok_cb),
@@ -318,9 +338,13 @@ gnomecc_preferences_get_config_dialog (GnomeCCPreferences *prefs)
 		(GNOME_DIALOG (prefs_dialog), 2,
 		 GTK_SIGNAL_FUNC (prefs_dialog_cancel_cb),
 		 prefs_dialog_data);
+#else
+	g_signal_connect (G_OBJECT (prefs_dialog), "response",
+			  (GCallback) prefs_dialog_response, prefs_dialog_data);
+#endif
 
-	gtk_object_set_data (GTK_OBJECT (prefs_dialog_data), 
-			     "prefs_struct", prefs);
+	g_object_set_data (G_OBJECT (prefs_dialog_data), 
+			   "prefs_struct", prefs);
 
 	glade_xml_signal_connect (prefs_dialog_data,
 				  "tree_widget_toggled_cb",