Massive code cleanup (bug #429422)

svn path=/trunk/; revision=33432

8 files changed, 33 insertions, 21 deletions

diff --git a/shell/ChangeLog b/shell/ChangeLog
index cd3b213915..a24d62a802 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,25 @@
+2007-04-19  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #429422
+
+	* e-shell.c (impl_finalize):
+	e_free_string_list() is dead; just do it manually.
+
+	* e-user-creatable-items-handler.c (setup_toolbar_button):
+	Use g_object_ref_sink() instead of gtk_object_sink().
+
+	* e-shell-importer.c:
+	Drop support for GnomeFileEntry.
+
+	* importer/intelligent.c (create_gui):
+	Use g_object_ref() instead of gtk_widget_ref().
+
+	* e-history.c (e_history_init):
+	Clear the floating flag without using GTK_OBJECT_UNSET_FLAGS().
+
+	* e-shell-settings-dialog.c:
+	Include missing header file(s).
+
 2007-03-29  Matthew Barnes  <mbarnes@redhat.com>
 
 	* e-shell-window.c:
diff --git a/shell/e-history.c b/shell/e-history.c
index e279fb81bc..ebe412b8d9 100644
--- a/shell/e-history.c
+++ b/shell/e-history.c
@@ -79,7 +79,10 @@ e_history_init (EHistory *history)
 
 	history->priv = priv;
 
-	GTK_OBJECT_UNSET_FLAGS (history, GTK_FLOATING);
+	/* XXX I guess just clear the floating flag. */
+	/* GTK_OBJECT_UNSET_FLAGS (history, GTK_FLOATING); */
+	g_object_ref_sink (history);
+	g_object_unref (history);
 }
 
 
diff --git a/shell/e-shell-importer.c b/shell/e-shell-importer.c
index 29946319be..6e0a076e97 100644
--- a/shell/e-shell-importer.c
+++ b/shell/e-shell-importer.c
@@ -38,7 +38,6 @@
 #include <libgnomeui/gnome-druid.h>
 #include <libgnomeui/gnome-druid-page-edge.h>
 #include <libgnomeui/gnome-druid-page-standard.h>
-#include <libgnomeui/gnome-file-entry.h>
 
 #include <gtk/gtkfilechooserbutton.h>
 
@@ -46,7 +45,6 @@
 
 #include "e-util/e-dialog-utils.h"
 #include "e-util/e-error.h"
-#include "e-util/e-gtk-utils.h"
 #include "e-util/e-icon-factory.h"
 #include "e-util/e-import.h"
 #include "e-util/e-util-private.h"
@@ -188,11 +186,7 @@ filename_changed (GtkWidget *widget,
 
 	page = data->filepage;
 
-#ifdef USE_GTKFILECHOOSER
 	filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (widget));
-#else
-	filename = gtk_entry_get_text ((GtkEntry *) gnome_file_entry_get_entry ((GnomeFileEntry *)widget));
-#endif
 
 	fileok = filename && filename[0] && g_file_test(filename, G_FILE_TEST_IS_REGULAR);
 	if (fileok) {
@@ -293,16 +287,8 @@ importer_file_page_new (ImportData *data)
 			  GTK_FILL, 0, 0, 0);
 	gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5);
 
-#ifdef USE_GTKFILECHOOSER
 	page->filename = gtk_file_chooser_button_new (_("Select a file"), GTK_FILE_CHOOSER_ACTION_OPEN);
 	g_signal_connect (GTK_FILE_CHOOSER_BUTTON (page->filename), "selection-changed", G_CALLBACK (filename_changed), data);
-#else
-	page->filename = gnome_file_entry_new ("Evolution_Importer_FileName", _("Select a file"));
-	g_object_set (G_OBJECT (page->filename), "use_filechooser", TRUE, NULL);
-	entry = gnome_file_entry_gtk_entry((GnomeFileEntry *)page->filename);
-	g_signal_connect (entry, "changed", G_CALLBACK (filename_changed), data);
-	gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE);
-#endif
 
 	gtk_table_attach (GTK_TABLE (table), page->filename, 1, 2, 
 			  row, row + 1, GTK_EXPAND | GTK_FILL, 0, 0, 0);
diff --git a/shell/e-shell-settings-dialog.c b/shell/e-shell-settings-dialog.c
index 67dc214b41..9f3f24e2a2 100644
--- a/shell/e-shell-settings-dialog.c
+++ b/shell/e-shell-settings-dialog.c
@@ -25,6 +25,8 @@
 #include <config.h>
 #endif
 
+#include <glib/gi18n.h>
+
 #include "e-shell-settings-dialog.h"
 
 #include "e-corba-config-page.h"
@@ -170,7 +172,7 @@ load_pages (EShellSettingsDialog *dialog)
 
 	language_names = g_get_language_names ();
 	while (*language_names != NULL)
-		languages = g_list_append (languages, *language_names++);
+		languages = g_slist_append (languages, *language_names++);
 
 	page_list = NULL;
 	for (i = 0; i < control_list->_length; i ++) {
diff --git a/shell/e-shell.c b/shell/e-shell.c
index 95eb91078a..c6b380a1ec 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -474,7 +474,8 @@ impl_finalize (GObject *object)
 	shell = E_SHELL (object);
 	priv = shell->priv;
 
-	e_free_string_list (priv->crash_type_names);
+	g_list_foreach (priv->crash_type_names, (GFunc) g_free, NULL);
+	g_list_free (priv->crash_type_names);
 
 	g_free (priv);
 
diff --git a/shell/e-user-creatable-items-handler.c b/shell/e-user-creatable-items-handler.c
index 11e859d867..392f2ab3b7 100644
--- a/shell/e-user-creatable-items-handler.c
+++ b/shell/e-user-creatable-items-handler.c
@@ -753,8 +753,7 @@ setup_toolbar_button (EUserCreatableItemsHandler *handler)
 
 	gtk_widget_show (priv->new_button);
 	priv->tooltips = gtk_tooltips_new ();
-	gtk_object_ref (GTK_OBJECT (priv->tooltips));
-	gtk_object_sink (GTK_OBJECT (priv->tooltips));
+	g_object_ref_sink (priv->tooltips);
 	gtk_tooltips_set_tip (priv->tooltips, priv->new_button,
 			      priv->default_menu_item->tooltip, NULL);
 	g_free (val);
diff --git a/shell/importer/intelligent.c b/shell/importer/intelligent.c
index e6130a26e7..f1cffb82aa 100644
--- a/shell/importer/intelligent.c
+++ b/shell/importer/intelligent.c
@@ -343,7 +343,7 @@ create_gui (GList *importers)
 			/* Ref this widget so even if we remove it from the
 			   containers it will always have an extra ref. */
 			gtk_widget_show (data->widget);
-			gtk_widget_ref (data->widget);
+			g_object_ref (data->widget);
 		} else {
 			data->widget = gtk_label_new ("");
 		}
diff --git a/shell/main.c b/shell/main.c
index b8ac07f92f..f9b59170f7 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -26,7 +26,6 @@
 #include <glib/gstdio.h>
 
 #include "e-util/e-dialog-utils.h"
-#include "e-util/e-gtk-utils.h"
 #include "e-util/e-bconf-map.h"
 
 #include <e-util/e-icon-factory.h>