Fix compiler warnings and deprecated GTK+ API usage.

14 files changed, 27 insertions, 25 deletions

diff --git a/modules/addressbook/autocompletion-config.c b/modules/addressbook/autocompletion-config.c
index 68e276d1c7..ac6a7d1860 100644
--- a/modules/addressbook/autocompletion-config.c
+++ b/modules/addressbook/autocompletion-config.c
@@ -30,6 +30,7 @@
 #include <libedataserverui/e-source-selector.h>
 #include <libedataserverui/e-name-selector-entry.h>
 
+#include "e-util/e-binding.h"
 #include "e-util/e-datetime-format.h"
 #include "widgets/misc/e-preferences-window.h"
 
diff --git a/modules/calendar/e-cal-shell-content.c b/modules/calendar/e-cal-shell-content.c
index 0dd3ff1ece..7d819d8d8b 100644
--- a/modules/calendar/e-cal-shell-content.c
+++ b/modules/calendar/e-cal-shell-content.c
@@ -304,7 +304,6 @@ cal_shell_content_constructed (GObject *object)
 	EShellContent *foreign_content;
 	EShellView *foreign_view;
 	GnomeCalendar *calendar;
-	GnomeCalendarViewType view_type;
 	GalViewInstance *view_instance;
 	GConfBridge *bridge;
 	GtkWidget *container;
@@ -313,7 +312,6 @@ cal_shell_content_constructed (GObject *object)
 	const gchar *key;
 	gchar *filename;
 	gchar *markup;
-	gint page_num;
 	gint ii;
 
 	priv = E_CAL_SHELL_CONTENT_GET_PRIVATE (object);
@@ -477,7 +475,6 @@ static void
 cal_shell_content_map (GtkWidget *widget)
 {
 	ECalShellContentPrivate *priv;
-	GalViewInstance *view_instance;
 
 	/* XXX Delay loading the GalViewInstance until after ECalShellView
 	 *     has a chance to install the sidebar's date navigator into
diff --git a/modules/calendar/e-cal-shell-migrate.c b/modules/calendar/e-cal-shell-migrate.c
index bc17a90e9b..f59b62597c 100644
--- a/modules/calendar/e-cal-shell-migrate.c
+++ b/modules/calendar/e-cal-shell-migrate.c
@@ -134,19 +134,19 @@ setup_progress_dialog (void)
 
 	gtk_label_set_line_wrap ((GtkLabel *) w, TRUE);
 	gtk_widget_show (w);
-	gtk_box_pack_start_defaults ((GtkBox *) vbox, w);
+	gtk_box_pack_start ((GtkBox *) vbox, w, TRUE, TRUE, 0);
 
 	hbox = gtk_hbox_new (FALSE, 6);
 	gtk_widget_show (hbox);
-	gtk_box_pack_start_defaults ((GtkBox *) vbox, hbox);
+	gtk_box_pack_start ((GtkBox *) vbox, hbox, TRUE, TRUE, 0);
 
 	label = (GtkLabel *) gtk_label_new ("");
 	gtk_widget_show ((GtkWidget *) label);
-	gtk_box_pack_start_defaults ((GtkBox *) hbox, (GtkWidget *) label);
+	gtk_box_pack_start ((GtkBox *) hbox, (GtkWidget *) label, TRUE, TRUE, 0);
 
 	progress = (GtkProgressBar *) gtk_progress_bar_new ();
 	gtk_widget_show ((GtkWidget *) progress);
-	gtk_box_pack_start_defaults ((GtkBox *) hbox, (GtkWidget *) progress);
+	gtk_box_pack_start ((GtkBox *) hbox, (GtkWidget *) progress, TRUE, TRUE, 0);
 
 	gtk_widget_show (window);
 }
diff --git a/modules/calendar/e-cal-shell-settings.c b/modules/calendar/e-cal-shell-settings.c
index c6d3c984fb..4e6939c892 100644
--- a/modules/calendar/e-cal-shell-settings.c
+++ b/modules/calendar/e-cal-shell-settings.c
@@ -24,6 +24,8 @@
 #include <gconf/gconf-client.h>
 #include <libecal/e-cal-util.h>
 
+#include "e-util/e-binding.h"
+
 static gboolean
 transform_string_to_icaltimezone (const GValue *src_value,
                                   GValue *dst_value,
diff --git a/modules/calendar/e-cal-shell-view-actions.c b/modules/calendar/e-cal-shell-view-actions.c
index 699cf2460c..b36c94b8d1 100644
--- a/modules/calendar/e-cal-shell-view-actions.c
+++ b/modules/calendar/e-cal-shell-view-actions.c
@@ -264,7 +264,10 @@ action_calendar_properties_cb (GtkAction *action,
 	source = e_source_selector_peek_primary_selection (selector);
 	g_return_if_fail (E_IS_SOURCE (source));
 
-	calendar_setup_edit_calendar (GTK_WINDOW (shell_window), source);
+	/* XXX Does this -really- need a source group parameter? */
+	calendar_setup_edit_calendar (
+		GTK_WINDOW (shell_window), source,
+		e_source_peek_group (source));
 }
 
 static void
diff --git a/modules/calendar/e-cal-shell-view-private.c b/modules/calendar/e-cal-shell-view-private.c
index 719e705382..a81b7cd866 100644
--- a/modules/calendar/e-cal-shell-view-private.c
+++ b/modules/calendar/e-cal-shell-view-private.c
@@ -390,7 +390,6 @@ void
 e_cal_shell_view_private_dispose (ECalShellView *cal_shell_view)
 {
 	ECalShellViewPrivate *priv = cal_shell_view->priv;
-	GList *iter;
 
 	DISPOSE (priv->cal_shell_backend);
 	DISPOSE (priv->cal_shell_content);
diff --git a/modules/calendar/e-cal-shell-view-private.h b/modules/calendar/e-cal-shell-view-private.h
index 77f9e1b06b..f982e06a0f 100644
--- a/modules/calendar/e-cal-shell-view-private.h
+++ b/modules/calendar/e-cal-shell-view-private.h
@@ -29,9 +29,12 @@
 #include <libecal/e-cal-time-util.h>
 #include <libedataserver/e-categories.h>
 #include <libedataserver/e-data-server-util.h>
+#include <libedataserver/e-sexp.h>
 
-#include "e-util/e-util.h"
+#include "e-util/e-binding.h"
 #include "e-util/e-dialog-utils.h"
+#include "e-util/e-error.h"
+#include "e-util/e-util.h"
 #include "widgets/misc/e-popup-action.h"
 
 #include "calendar/common/authentication.h"
@@ -41,8 +44,9 @@
 #include "calendar/gui/e-cal-model-tasks.h"
 #include "calendar/gui/e-calendar-view.h"
 #include "calendar/gui/gnome-cal.h"
-/*#include "calendar/gui/goto.h"*/
+#include "calendar/gui/goto.h"
 #include "calendar/gui/print.h"
+#include "calendar/gui/dialogs/calendar-setup.h"
 #include "calendar/gui/dialogs/copy-source-dialog.h"
 #include "calendar/gui/dialogs/event-editor.h"
 #include "calendar/gui/dialogs/memo-editor.h"
diff --git a/modules/calendar/e-task-shell-migrate.c b/modules/calendar/e-task-shell-migrate.c
index 4bbaee65a6..ebc03e971d 100644
--- a/modules/calendar/e-task-shell-migrate.c
+++ b/modules/calendar/e-task-shell-migrate.c
@@ -101,19 +101,19 @@ setup_progress_dialog (void)
 
 	gtk_label_set_line_wrap ((GtkLabel *) w, TRUE);
 	gtk_widget_show (w);
-	gtk_box_pack_start_defaults ((GtkBox *) vbox, w);
+	gtk_box_pack_start ((GtkBox *) vbox, w, TRUE, TRUE, 0);
 
 	hbox = gtk_hbox_new (FALSE, 6);
 	gtk_widget_show (hbox);
-	gtk_box_pack_start_defaults ((GtkBox *) vbox, hbox);
+	gtk_box_pack_start ((GtkBox *) vbox, hbox, TRUE, TRUE, 0);
 
 	label = (GtkLabel *) gtk_label_new ("");
 	gtk_widget_show ((GtkWidget *) label);
-	gtk_box_pack_start_defaults ((GtkBox *) hbox, (GtkWidget *) label);
+	gtk_box_pack_start ((GtkBox *) hbox, (GtkWidget *) label, TRUE, TRUE, 0);
 
 	progress = (GtkProgressBar *) gtk_progress_bar_new ();
 	gtk_widget_show ((GtkWidget *) progress);
-	gtk_box_pack_start_defaults ((GtkBox *) hbox, (GtkWidget *) progress);
+	gtk_box_pack_start ((GtkBox *) hbox, (GtkWidget *) progress, TRUE, TRUE, 0);
 
 	gtk_widget_show (window);
 }
diff --git a/modules/calendar/e-task-shell-view-private.c b/modules/calendar/e-task-shell-view-private.c
index 38c5ab6033..a0ca5ee978 100644
--- a/modules/calendar/e-task-shell-view-private.c
+++ b/modules/calendar/e-task-shell-view-private.c
@@ -224,7 +224,6 @@ e_task_shell_view_private_constructed (ETaskShellView *task_shell_view)
 	ECalModel *model;
 	ETable *table;
 	ESourceSelector *selector;
-	guint id;
 
 	shell_view = E_SHELL_VIEW (task_shell_view);
 	shell_backend = e_shell_view_get_shell_backend (shell_view);
@@ -363,7 +362,6 @@ void
 e_task_shell_view_private_dispose (ETaskShellView *task_shell_view)
 {
 	ETaskShellViewPrivate *priv = task_shell_view->priv;
-	GList *iter;
 
 	DISPOSE (priv->task_shell_backend);
 	DISPOSE (priv->task_shell_content);
diff --git a/modules/calendar/e-task-shell-view-private.h b/modules/calendar/e-task-shell-view-private.h
index 50fa306696..e612069bed 100644
--- a/modules/calendar/e-task-shell-view-private.h
+++ b/modules/calendar/e-task-shell-view-private.h
@@ -30,6 +30,7 @@
 #include <libedataserver/e-categories.h>
 #include <libedataserver/e-sexp.h>
 
+#include "e-util/e-binding.h"
 #include "e-util/e-dialog-utils.h"
 #include "e-util/e-error.h"
 #include "e-util/e-util.h"
diff --git a/modules/mail/e-mail-shell-backend.c b/modules/mail/e-mail-shell-backend.c
index 1c24d56eab..3da217d2ea 100644
--- a/modules/mail/e-mail-shell-backend.c
+++ b/modules/mail/e-mail-shell-backend.c
@@ -29,6 +29,7 @@
 
 #include "e-util/e-account-utils.h"
 #include "e-util/e-binding.h"
+#include "e-util/e-error.h"
 #include "e-util/e-import.h"
 #include "e-util/e-util.h"
 #include "shell/e-shell.h"
diff --git a/modules/mail/e-mail-shell-migrate.c b/modules/mail/e-mail-shell-migrate.c
index d2614befdb..7176d4fba7 100644
--- a/modules/mail/e-mail-shell-migrate.c
+++ b/modules/mail/e-mail-shell-migrate.c
@@ -1114,19 +1114,19 @@ em_migrate_setup_progress_dialog (const gchar *title, const gchar *desc)
 
 	gtk_label_set_line_wrap ((GtkLabel *) w, TRUE);
 	gtk_widget_show (w);
-	gtk_box_pack_start_defaults ((GtkBox *) vbox, w);
+	gtk_box_pack_start ((GtkBox *) vbox, w, TRUE, TRUE, 0);
 
 	hbox = gtk_hbox_new (FALSE, 6);
 	gtk_widget_show (hbox);
-	gtk_box_pack_start_defaults ((GtkBox *) vbox, hbox);
+	gtk_box_pack_start ((GtkBox *) vbox, hbox, TRUE, TRUE, 0);
 
 	label = (GtkLabel *) gtk_label_new ("");
 	gtk_widget_show ((GtkWidget *) label);
-	gtk_box_pack_start_defaults ((GtkBox *) hbox, (GtkWidget *) label);
+	gtk_box_pack_start ((GtkBox *) hbox, (GtkWidget *) label, TRUE, TRUE, 0);
 
 	progress = (GtkProgressBar *) gtk_progress_bar_new ();
 	gtk_widget_show ((GtkWidget *) progress);
-	gtk_box_pack_start_defaults ((GtkBox *) hbox, (GtkWidget *) progress);
+	gtk_box_pack_start ((GtkBox *) hbox, (GtkWidget *) progress, TRUE, TRUE, 0);
 
 	/* Prepare the message */
 	vbox = gtk_vbox_new (FALSE, 12);
diff --git a/modules/mail/em-composer-prefs.h b/modules/mail/em-composer-prefs.h
index 8f977dc9b9..6faa18b7d9 100644
--- a/modules/mail/em-composer-prefs.h
+++ b/modules/mail/em-composer-prefs.h
@@ -62,9 +62,6 @@ struct _EMComposerPrefs {
 
 	/* General tab */
 
-	/* Default Behavior */
-	GtkOptionMenu *charset;
-
 	GtkTreeModel *language_model;
 
 	/* Forwards and Replies */
diff --git a/modules/mail/em-mailer-prefs.h b/modules/mail/em-mailer-prefs.h
index e35c2085ab..01f823b11e 100644
--- a/modules/mail/em-mailer-prefs.h
+++ b/modules/mail/em-mailer-prefs.h
@@ -69,7 +69,6 @@ struct _EMMailerPrefs {
 
 	/* Message Display */
 	GtkSpinButton *timeout;
-	GtkOptionMenu *charset;
 
 	/* HTML Mail tab */
 	GtkFontButton *font_variable;