From 97e48e352419d360934a46a05c944d604fd968e9 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 10 Jan 2009 23:41:27 +0000 Subject: ** Fixes bug #567276 2009-01-10 Matthew Barnes ** 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 . * 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 --- addressbook/ChangeLog | 8 +++ addressbook/gui/widgets/e-addressbook-view.c | 1 - addressbook/printing/test-print.c | 1 - calendar/ChangeLog | 20 +++++++ calendar/gui/alarm-notify/alarm-queue.c | 1 - calendar/gui/calendar-commands.c | 1 - calendar/gui/calendar-config.c | 61 ---------------------- calendar/gui/calendar-config.h | 3 -- calendar/gui/control-factory.c | 1 - calendar/gui/dialogs/schedule-page.c | 1 - calendar/gui/e-itip-control.c | 2 - calendar/gui/gnome-cal.c | 2 - calendar/gui/goto.c | 2 - calendar/gui/memos-control.c | 2 - calendar/gui/print.c | 1 - calendar/gui/tasks-control.c | 8 --- widgets/ChangeLog | 7 +++ widgets/menus/gal-view-menus.c | 1 - widgets/misc/ChangeLog | 7 +++ widgets/misc/test-color.c | 78 ---------------------------- 20 files changed, 42 insertions(+), 166 deletions(-) delete mode 100644 widgets/misc/test-color.c diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 4bbe3f00d0..1857974c16 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,11 @@ +2009-01-10 Matthew Barnes + + ** Fixes part of bug #567276 + + * gui/widgets/e-addressbook-view.c: + * printing/test-print.c: + Remove unneeded #include . + 2009-01-10 Andre Klapper * Fix for bug #567282 diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c index cc5558324e..dc0b234745 100644 --- a/addressbook/gui/widgets/e-addressbook-view.c +++ b/addressbook/gui/widgets/e-addressbook-view.c @@ -32,7 +32,6 @@ #include #include #include -#include #include "addressbook/printing/e-contact-print.h" #include "addressbook/gui/widgets/eab-popup.h" diff --git a/addressbook/printing/test-print.c b/addressbook/printing/test-print.c index 6616a92fff..9ca6e53891 100644 --- a/addressbook/printing/test-print.c +++ b/addressbook/printing/test-print.c @@ -24,7 +24,6 @@ #include #include -#include #include #include #include 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 + + ** 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 . + + * gui/calendar-config.c: + * gui/calendar-config.h: + Removed unused function calendar_config_check_timezone_set(). + 2009-01-09 Takao Fujiwara Reviewed by Matthew Barnes 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 #include #include -#include #include #include 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 #include -#include #include #include #include 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 #include -#include #include #include #include @@ -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 #include #include -#include #include #include 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 #include -#include #include #include #include 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 #include #include -#include -#include #include #include #include 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 #include #include -#include -#include #include #include #include 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 #include -#include #include #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 #include #include -#include -#include #include #include #include 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 #include #include -#include #include #include #include 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 #include #include -#include -#include #include #include #include @@ -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 } diff --git a/widgets/ChangeLog b/widgets/ChangeLog index fea34cfe49..e7a12a4341 100644 --- a/widgets/ChangeLog +++ b/widgets/ChangeLog @@ -1,3 +1,10 @@ +2009-01-10 Matthew Barnes + + ** Fixes part of bug #567276 + + * menus/gal-view-menus.c: + Remove unneeded #include . + 2009-01-09 Takao Fujiwara Reviewed by Matthew Barnes diff --git a/widgets/menus/gal-view-menus.c b/widgets/menus/gal-view-menus.c index 8640d5fb6b..7305ff0534 100644 --- a/widgets/menus/gal-view-menus.c +++ b/widgets/menus/gal-view-menus.c @@ -33,7 +33,6 @@ #include #include #include -#include #include #include #include diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog index 7b9293b37b..d0e2cf68ec 100644 --- a/widgets/misc/ChangeLog +++ b/widgets/misc/ChangeLog @@ -1,3 +1,10 @@ +2009-01-10 Matthew Barnes + + ** Fixes part of bug #567276 + + * test-color.c: + We don't ship this. Remove it. + 2009-01-10 Matthew Barnes ** Fixes part of bug #567285 diff --git a/widgets/misc/test-color.c b/widgets/misc/test-color.c deleted file mode 100644 index f86166a228..0000000000 --- a/widgets/misc/test-color.c +++ /dev/null @@ -1,78 +0,0 @@ -/* - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) version 3. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see - * - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - */ - -#include - -#include - -#include - -#include "color-palette.h" -#include "e-colors.h" -#include "widget-color-combo.h" - -#include "pixmaps/cursor_hand_open.xpm" - -/* To compile (from src/widgets): - -gcc -I.. -I../.. -L. -Wall -o tester tester.c ../color.c `gnome-config --cflags --libs gnome gnomeui` -lwidgets - -*/ - -gint -main ( gint argc, gchar* argv[] ) -{ - GtkWidget * dialog; - GtkWidget * T; - ColorGroup *cg; - - gnome_program_init ("tester", "1.0", - LIBGNOMEUI_MODULE, - argc, argv, NULL); - - dialog = gnome_dialog_new ("TESTER", GNOME_STOCK_BUTTON_OK, - GNOME_STOCK_BUTTON_CANCEL, NULL); - - cg = color_group_fetch ("fore_color_group", dialog); - T = color_palette_new ("Color Palette", NULL, cg); - - gtk_box_pack_start(GTK_BOX (GNOME_DIALOG (dialog)-> vbox ), - T, TRUE, TRUE, 5); - gtk_widget_show_all (T); - - cg = color_group_fetch ("fore_color_group", dialog); - T = color_combo_new ( - gdk_pixbuf_new_from_xpm_data ((char const **)cursor_hand_open_xpm), - _("Automatic"), &e_black, cg); - gtk_box_pack_start(GTK_BOX (GNOME_DIALOG (dialog)-> vbox ), - T, TRUE, TRUE, 5); - gtk_widget_show_all (T); - - cg = color_group_fetch ("back_color_group", dialog); - T = color_combo_new ( - gdk_pixbuf_new_from_xpm_data ((char const **)cursor_hand_open_xpm), - _("Automatic"), &e_black, cg); - gtk_box_pack_start(GTK_BOX (GNOME_DIALOG (dialog)-> vbox ), - T, TRUE, TRUE, 5); - gtk_widget_show_all (T); - - gnome_dialog_run_and_close ( GNOME_DIALOG (dialog) ); - return 0; -} -- cgit