** Fixes bug #567276

2009-01-10  Matthew Barnes  <mbarnes@redhat.com>

	** Fixes bug #567276

	* addressbook/gui/widgets/e-addressbook-view.c:
	* addressbook/printing/test-print.c:
	* calendar/gui/calendar-commands.c:
	* calendar/gui/control-factory.c:
	* calendar/gui/e-itip-control.c:
	* calendar/gui/gnome-cal.c:
	* calendar/gui/goto.c:
	* calendar/gui/memos-control.c:
	* calendar/gui/print.c:
	* calendar/gui/tasks-control.c:
	* calendar/gui/alarm-notify/alarm-queue.c:
	* calendar/gui/dialogs/schedule-page.c:
	* widgets/menus/gal-view-menus.c:
	Remove unneeded #include <libgnomeui/gnome-dialog-util.h>.

	* calendar/gui/calendar-config.c:
	* calendar/gui/calendar-config.h:
	Removed unused function calendar_config_check_timezone_set().

	* widgets/misc/test-color.c:
	We don't ship this.  Remove it.


svn path=/trunk/; revision=37030

13 files changed, 20 insertions, 85 deletions

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 504c1df694..73042487ae 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,23 @@
+2009-01-10  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #567276
+
+	* gui/calendar-commands.c:
+	* gui/control-factory.c:
+	* gui/e-itip-control.c:
+	* gui/gnome-cal.c:
+	* gui/goto.c:
+	* gui/memos-control.c:
+	* gui/print.c:
+	* gui/tasks-control.c:
+	* gui/alarm-notify/alarm-queue.c:
+	* gui/dialogs/schedule-page.c:
+	Remove unneeded #include <libgnomeui/gnome-dialog-util.h>.
+
+	* gui/calendar-config.c:
+	* gui/calendar-config.h:
+	Removed unused function calendar_config_check_timezone_set().
+
 2009-01-09  Takao Fujiwara  <takao.fujiwara@sun.com>
 
 	Reviewed by Matthew Barnes  <mbarnes@redhat.com>
diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c
index 5fba590646..b49681045a 100644
--- a/calendar/gui/alarm-notify/alarm-queue.c
+++ b/calendar/gui/alarm-notify/alarm-queue.c
@@ -36,7 +36,6 @@
 #include <glib/gi18n.h>
 #include <libgnome/gnome-exec.h>
 #include <libgnome/gnome-sound.h>
-#include <libgnomeui/gnome-dialog-util.h>
 #include <libgnomeui/gnome-uidefs.h>
 
 #include <libecal/e-cal-time-util.h>
diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c
index 074b902063..750eb88c5a 100644
--- a/calendar/gui/calendar-commands.c
+++ b/calendar/gui/calendar-commands.c
@@ -37,7 +37,6 @@
 #include <errno.h>
 
 #include <gtk/gtk.h>
-#include <libgnomeui/gnome-dialog-util.h>
 #include <libgnomeui/gnome-messagebox.h>
 #include <libgnomeui/gnome-stock-icons.h>
 #include <libgnome/gnome-util.h>
diff --git a/calendar/gui/calendar-config.c b/calendar/gui/calendar-config.c
index 60c128b0cd..484695fee8 100644
--- a/calendar/gui/calendar-config.c
+++ b/calendar/gui/calendar-config.c
@@ -31,7 +31,6 @@
 
 #include <string.h>
 #include <time.h>
-#include <libgnomeui/gnome-dialog.h>
 #include <libedataserver/e-data-server-util.h>
 #include <e-util/e-util.h>
 #include <widgets/e-timezone-dialog/e-timezone-dialog.h>
@@ -47,13 +46,6 @@ static GConfClient *config = NULL;
 /* Store the zones here, this is not destroyed as the ical timezones */
 static GHashTable *custom_zones = NULL;
 
-static void on_timezone_set		(GnomeDialog	*dialog,
-					 int		 button,
-					 ETimezoneDialog *etd);
-static gboolean on_timezone_dialog_delete_event	(GnomeDialog	*dialog,
-						 GdkEvent	*event,
-						 ETimezoneDialog *etd);
-
 static void
 do_cleanup (void)
 {
@@ -1240,59 +1232,6 @@ calendar_config_set_confirm_purge (gboolean confirm)
 	gconf_client_set_bool (config, CALENDAR_CONFIG_PROMPT_PURGE, confirm, NULL);
 }
 
-void
-calendar_config_check_timezone_set (void)
-{
-	ETimezoneDialog *timezone_dialog;
-	GtkWidget *dialog;
-	GList *elem;
-	char *zone;
-
-	zone = calendar_config_get_timezone ();
-	if (zone && zone[0])
-		return;
-
-	/* Show timezone dialog. */
-	timezone_dialog = e_timezone_dialog_new ();
-	dialog = e_timezone_dialog_get_toplevel (timezone_dialog);
-
-	/* Hide the cancel button, which is the 2nd button. */
-	elem = g_list_nth (GNOME_DIALOG (dialog)->buttons, 1);
-	gtk_widget_hide (elem->data);
-
-	g_signal_connect (dialog, "clicked",
-			  G_CALLBACK (on_timezone_set), timezone_dialog);
-	g_signal_connect (dialog, "delete-event",
-			  G_CALLBACK (on_timezone_dialog_delete_event), timezone_dialog);
-
-	gtk_widget_show (dialog);
-}
-
-
-static void
-on_timezone_set			(GnomeDialog	*dialog,
-				 int		 button,
-				 ETimezoneDialog *etd)
-{
-	icaltimezone *zone;
-
-	zone = e_timezone_dialog_get_timezone (etd);
-	if (zone)
-		calendar_config_set_timezone (icaltimezone_get_location (zone));
-
-	g_object_unref (etd);
-}
-
-
-static gboolean
-on_timezone_dialog_delete_event	(GnomeDialog	*dialog,
-				 GdkEvent	*event,
-				 ETimezoneDialog *etd)
-{
-	g_object_unref (etd);
-	return TRUE;
-}
-
 
 /**
  * calendar_config_get_tasks_due_today_color:
diff --git a/calendar/gui/calendar-config.h b/calendar/gui/calendar-config.h
index 03a9a6e461..72a5560dd5 100644
--- a/calendar/gui/calendar-config.h
+++ b/calendar/gui/calendar-config.h
@@ -247,9 +247,6 @@ void calendar_config_set_free_busy_template (const gchar *template);
 guint calendar_config_add_notification_free_busy_template (GConfClientNotifyFunc func,
 							   gpointer data);
 
-/* Shows the timezone dialog if the user hasn't set a default timezone. */
-void	  calendar_config_check_timezone_set	(void);
-
 /* Returns TRUE if the locale has 'am' and 'pm' strings defined, i.e. it
    supports 12-hour time format. */
 gboolean  calendar_config_locale_supports_12_hour_format(void);
diff --git a/calendar/gui/control-factory.c b/calendar/gui/control-factory.c
index 288558dc14..2fcb3e2688 100644
--- a/calendar/gui/control-factory.c
+++ b/calendar/gui/control-factory.c
@@ -29,7 +29,6 @@
 #include <bonobo/bonobo-persist-file.h>
 #include <bonobo/bonobo-context.h>
 #include <glade/glade.h>
-#include <libgnomeui/gnome-dialog-util.h>
 
 #include <libecal/e-cal-time-util.h>
 #include <gui/gnome-cal.h>
diff --git a/calendar/gui/dialogs/schedule-page.c b/calendar/gui/dialogs/schedule-page.c
index 534923a853..e1137be3a0 100644
--- a/calendar/gui/dialogs/schedule-page.c
+++ b/calendar/gui/dialogs/schedule-page.c
@@ -31,7 +31,6 @@
 
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <libgnomeui/gnome-dialog-util.h>
 #include <glade/glade.h>
 #include <e-util/e-dialog-widgets.h>
 #include <e-util/e-util-private.h>
diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c
index 96a1f5a8b6..429a50d896 100644
--- a/calendar/gui/e-itip-control.c
+++ b/calendar/gui/e-itip-control.c
@@ -34,8 +34,6 @@
 #include <libgnome/gnome-util.h>
 #include <libgnomeui/gnome-stock-icons.h>
 #include <libgnomeui/gnome-uidefs.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <libgnomeui/gnome-dialog-util.h>
 #include <bonobo/bonobo-object.h>
 #include <bonobo/bonobo-exception.h>
 #include <gtkhtml/gtkhtml.h>
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index 4325a4d36a..32a2a4c746 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -37,8 +37,6 @@
 #include <gdk/gdkkeysyms.h>
 #include <glib/gi18n.h>
 #include <libgnome/gnome-util.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <libgnomeui/gnome-dialog-util.h>
 #include <bonobo/bonobo-exception.h>
 #include <libedataserver/e-categories.h>
 #include <libedataserver/e-url.h>
diff --git a/calendar/gui/goto.c b/calendar/gui/goto.c
index 99d8b938e5..200cc0134b 100644
--- a/calendar/gui/goto.c
+++ b/calendar/gui/goto.c
@@ -26,7 +26,6 @@
 
 #include <config.h>
 #include <gtk/gtk.h>
-#include <libgnomeui/gnome-dialog.h>
 #include <glade/glade.h>
 #include "e-util/e-util-private.h"
 #include "calendar-commands.h"
@@ -110,7 +109,6 @@ ecal_event (ECalendarItem *calitem, gpointer user_data)
 	gnome_calendar_goto (dlg->gcal, et);
 
 	gtk_dialog_response (GTK_DIALOG (dlg->dialog), GTK_RESPONSE_NONE);
-	/* gnome_dialog_close (GNOME_DIALOG (dlg->dialog)); */
 }
 
 /* Returns the current time, for the ECalendarItem. */
diff --git a/calendar/gui/memos-control.c b/calendar/gui/memos-control.c
index cad3a70ab8..f84410d19c 100644
--- a/calendar/gui/memos-control.c
+++ b/calendar/gui/memos-control.c
@@ -30,8 +30,6 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <libgnome/gnome-util.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <libgnomeui/gnome-dialog-util.h>
 #include <libgnomeui/gnome-stock-icons.h>
 #include <bonobo/bonobo-control.h>
 #include <bonobo/bonobo-ui-util.h>
diff --git a/calendar/gui/print.c b/calendar/gui/print.c
index 28cb2b7dc7..db5e526cf8 100644
--- a/calendar/gui/print.c
+++ b/calendar/gui/print.c
@@ -36,7 +36,6 @@
 #include <glib.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <libgnomeui/gnome-dialog.h>
 #include <libgnomeui/gnome-uidefs.h>
 #include <libgnomeui/gnome-stock-icons.h>
 #include <libedataserver/e-time-utils.h>
diff --git a/calendar/gui/tasks-control.c b/calendar/gui/tasks-control.c
index 1b370da48c..9fe5eaa262 100644
--- a/calendar/gui/tasks-control.c
+++ b/calendar/gui/tasks-control.c
@@ -28,8 +28,6 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <libgnome/gnome-util.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <libgnomeui/gnome-dialog-util.h>
 #include <libgnomeui/gnome-stock-icons.h>
 #include <bonobo/bonobo-control.h>
 #include <bonobo/bonobo-ui-util.h>
@@ -320,12 +318,6 @@ tasks_control_activate (BonoboControl *control, ETasks *tasks)
 
 	bonobo_ui_component_add_listener(uic, "ViewPreview", tasks_control_view_preview, tasks);
 	bonobo_ui_component_set_prop(uic, "/commands/ViewPreview", "state", state?"1":"0", NULL);
-	/* Show the dialog for setting the timezone if the user hasn't chosen
-	   a default timezone already. This is done in the startup wizard now,
-	   so we don't do it here. */
-#if 0
-	calendar_config_check_timezone_set ();
-#endif
 }