evolution r37030 - in trunk: addressbook addressbook/gui/widgets addressbook/printing calendar calendar/gui calendar/gui/alarm-notify calendar/gui/dialogs widgets widgets/menus widgets/misc

[mbarnes svn gnome org]

Author: mbarnes
Date: Sat Jan 10 23:41:27 2009
New Revision: 37030
URL: http://svn.gnome.org/viewvc/evolution?rev=37030&view=rev

Log:
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.



Removed:
   trunk/widgets/misc/test-color.c
Modified:
   trunk/addressbook/ChangeLog
   trunk/addressbook/gui/widgets/e-addressbook-view.c
   trunk/addressbook/printing/test-print.c
   trunk/calendar/ChangeLog
   trunk/calendar/gui/alarm-notify/alarm-queue.c
   trunk/calendar/gui/calendar-commands.c
   trunk/calendar/gui/calendar-config.c
   trunk/calendar/gui/calendar-config.h
   trunk/calendar/gui/control-factory.c
   trunk/calendar/gui/dialogs/schedule-page.c
   trunk/calendar/gui/e-itip-control.c
   trunk/calendar/gui/gnome-cal.c
   trunk/calendar/gui/goto.c
   trunk/calendar/gui/memos-control.c
   trunk/calendar/gui/print.c
   trunk/calendar/gui/tasks-control.c
   trunk/widgets/ChangeLog
   trunk/widgets/menus/gal-view-menus.c
   trunk/widgets/misc/ChangeLog

Modified: trunk/addressbook/gui/widgets/e-addressbook-view.c
==============================================================================
--- trunk/addressbook/gui/widgets/e-addressbook-view.c	(original)
+++ trunk/addressbook/gui/widgets/e-addressbook-view.c	Sat Jan 10 23:41:27 2009
@@ -32,7 +32,6 @@
 #include <filter/rule-editor.h>
 #include <widgets/menus/gal-view-etable.h>
 #include <e-util/e-xml-utils.h>
-#include <libgnomeui/gnome-dialog-util.h>
 
 #include "addressbook/printing/e-contact-print.h"
 #include "addressbook/gui/widgets/eab-popup.h"

Modified: trunk/addressbook/printing/test-print.c
==============================================================================
--- trunk/addressbook/printing/test-print.c	(original)
+++ trunk/addressbook/printing/test-print.c	Sat Jan 10 23:41:27 2009
@@ -24,7 +24,6 @@
 
 #include <stdlib.h>
 #include <gtk/gtk.h>
-#include <libgnomeui/gnome-dialog.h>
 #include <libgnomeui/gnome-ui-init.h>
 #include <glade/glade.h>
 #include <bonobo/bonobo-main.h>

Modified: trunk/calendar/gui/alarm-notify/alarm-queue.c
==============================================================================
--- trunk/calendar/gui/alarm-notify/alarm-queue.c	(original)
+++ trunk/calendar/gui/alarm-notify/alarm-queue.c	Sat Jan 10 23:41:27 2009
@@ -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>

Modified: trunk/calendar/gui/calendar-commands.c
==============================================================================
--- trunk/calendar/gui/calendar-commands.c	(original)
+++ trunk/calendar/gui/calendar-commands.c	Sat Jan 10 23:41:27 2009
@@ -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>

Modified: trunk/calendar/gui/calendar-config.c
==============================================================================
--- trunk/calendar/gui/calendar-config.c	(original)
+++ trunk/calendar/gui/calendar-config.c	Sat Jan 10 23:41:27 2009
@@ -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 @@
 /* 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 @@
 	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:

Modified: trunk/calendar/gui/calendar-config.h
==============================================================================
--- trunk/calendar/gui/calendar-config.h	(original)
+++ trunk/calendar/gui/calendar-config.h	Sat Jan 10 23:41:27 2009
@@ -247,9 +247,6 @@
 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);

Modified: trunk/calendar/gui/control-factory.c
==============================================================================
--- trunk/calendar/gui/control-factory.c	(original)
+++ trunk/calendar/gui/control-factory.c	Sat Jan 10 23:41:27 2009
@@ -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>

Modified: trunk/calendar/gui/dialogs/schedule-page.c
==============================================================================
--- trunk/calendar/gui/dialogs/schedule-page.c	(original)
+++ trunk/calendar/gui/dialogs/schedule-page.c	Sat Jan 10 23:41:27 2009
@@ -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>

Modified: trunk/calendar/gui/e-itip-control.c
==============================================================================
--- trunk/calendar/gui/e-itip-control.c	(original)
+++ trunk/calendar/gui/e-itip-control.c	Sat Jan 10 23:41:27 2009
@@ -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>

Modified: trunk/calendar/gui/gnome-cal.c
==============================================================================
--- trunk/calendar/gui/gnome-cal.c	(original)
+++ trunk/calendar/gui/gnome-cal.c	Sat Jan 10 23:41:27 2009
@@ -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>

Modified: trunk/calendar/gui/goto.c
==============================================================================
--- trunk/calendar/gui/goto.c	(original)
+++ trunk/calendar/gui/goto.c	Sat Jan 10 23:41:27 2009
@@ -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 @@
 	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. */

Modified: trunk/calendar/gui/memos-control.c
==============================================================================
--- trunk/calendar/gui/memos-control.c	(original)
+++ trunk/calendar/gui/memos-control.c	Sat Jan 10 23:41:27 2009
@@ -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>

Modified: trunk/calendar/gui/print.c
==============================================================================
--- trunk/calendar/gui/print.c	(original)
+++ trunk/calendar/gui/print.c	Sat Jan 10 23:41:27 2009
@@ -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>

Modified: trunk/calendar/gui/tasks-control.c
==============================================================================
--- trunk/calendar/gui/tasks-control.c	(original)
+++ trunk/calendar/gui/tasks-control.c	Sat Jan 10 23:41:27 2009
@@ -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 @@
 
 	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
 }
 
 

Modified: trunk/widgets/menus/gal-view-menus.c
==============================================================================
--- trunk/widgets/menus/gal-view-menus.c	(original)
+++ trunk/widgets/menus/gal-view-menus.c	Sat Jan 10 23:41:27 2009
@@ -33,7 +33,6 @@
 #include <gtk/gtk.h>
 #include <libxml/parser.h>
 #include <libxml/xmlmemory.h>
-#include <libgnomeui/gnome-dialog.h>
 #include <glib/gi18n.h>
 #include <bonobo/bonobo-ui-util.h>
 #include <e-util/e-util.h>