From 591bcbeb910e0d90dc4076f09c23074c96a2e857 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 15 Sep 2009 05:15:53 -0500 Subject: Remove a bunch of unused functions. --- calendar/gui/Makefile.am | 3 - calendar/gui/cal-editor-utils.c | 3 - calendar/gui/calendar-component.dead.c | 1 - calendar/gui/calendar-config.c | 81 ------------- calendar/gui/calendar-config.h | 9 -- calendar/gui/e-comp-editor-registry.c | 213 --------------------------------- calendar/gui/e-comp-editor-registry.h | 72 ----------- calendar/gui/gnome-cal.c | 1 - 8 files changed, 383 deletions(-) delete mode 100644 calendar/gui/e-comp-editor-registry.c delete mode 100644 calendar/gui/e-comp-editor-registry.h (limited to 'calendar/gui') diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am index f05a038624..f5e3374f27 100644 --- a/calendar/gui/Makefile.am +++ b/calendar/gui/Makefile.am @@ -22,7 +22,6 @@ ecalendarinclude_HEADERS = \ e-cal-model.h \ e-calendar-view.h \ e-cell-date-edit-text.h \ - e-comp-editor-registry.h \ e-date-time-list.h \ e-day-view-layout.h \ e-day-view-main-item.h \ @@ -121,8 +120,6 @@ libevolution_calendar_la_SOURCES = \ e-calendar-view.h \ e-cell-date-edit-text.h \ e-cell-date-edit-text.c \ - e-comp-editor-registry.c \ - e-comp-editor-registry.h \ e-date-time-list.c \ e-date-time-list.h \ e-day-view-layout.c \ diff --git a/calendar/gui/cal-editor-utils.c b/calendar/gui/cal-editor-utils.c index 0da7ca2af9..4258e2ce01 100644 --- a/calendar/gui/cal-editor-utils.c +++ b/calendar/gui/cal-editor-utils.c @@ -26,13 +26,10 @@ #include "cal-editor-utils.h" -#include "e-comp-editor-registry.h" #include "dialogs/event-editor.h" #include "dialogs/task-editor.h" #include "dialogs/memo-editor.h" -extern ECompEditorRegistry *comp_editor_registry; - /** * open_component_editor: * @client: Already opened #ECal, where to store the component diff --git a/calendar/gui/calendar-component.dead.c b/calendar/gui/calendar-component.dead.c index e9629c70ee..9cd0e8eb21 100644 --- a/calendar/gui/calendar-component.dead.c +++ b/calendar/gui/calendar-component.dead.c @@ -45,7 +45,6 @@ #include "control-factory.h" #include "gnome-cal.h" #include "migration.h" -#include "e-comp-editor-registry.h" #include "comp-util.h" #include "common/authentication.h" #include "dialogs/calendar-setup.h" diff --git a/calendar/gui/calendar-config.c b/calendar/gui/calendar-config.c index 3208fb5f5b..dcc2677610 100644 --- a/calendar/gui/calendar-config.c +++ b/calendar/gui/calendar-config.c @@ -144,18 +144,6 @@ calendar_config_set_calendars_selected (GSList *selected) gconf_client_set_list (config, CALENDAR_CONFIG_SELECTED_CALENDARS, GCONF_VALUE_STRING, selected, NULL); } -guint -calendar_config_add_notification_calendars_selected (GConfClientNotifyFunc func, gpointer data) -{ - guint id; - - calendar_config_init (); - - id = gconf_client_notify_add (config, CALENDAR_CONFIG_SELECTED_CALENDARS, func, data, NULL, NULL); - - return id; -} - static gchar * calendar_config_get_timezone_stored (void) { @@ -307,18 +295,6 @@ calendar_config_set_time_divisions (gint divisions) gconf_client_set_int (config, CALENDAR_CONFIG_TIME_DIVISIONS, divisions, NULL); } -guint -calendar_config_add_notification_time_divisions (GConfClientNotifyFunc func, gpointer data) -{ - guint id; - - calendar_config_init (); - - id = gconf_client_notify_add (config, CALENDAR_CONFIG_TIME_DIVISIONS, func, data, NULL, NULL); - - return id; -} - /* Scroll in a month view by a week, not by a month */ gboolean calendar_config_get_month_scroll_by_week (void) @@ -348,27 +324,6 @@ calendar_config_add_notification_month_scroll_by_week (GConfClientNotifyFunc fun return id; } -/* Whether we show week numbers in the Date Navigator. */ -gboolean -calendar_config_get_dnav_show_week_no (void) -{ - calendar_config_init (); - - return gconf_client_get_bool (config, CALENDAR_CONFIG_DN_SHOW_WEEK_NUMBERS, NULL); -} - -guint -calendar_config_add_notification_dnav_show_week_no (GConfClientNotifyFunc func, gpointer data) -{ - guint id; - - calendar_config_init (); - - id = gconf_client_notify_add (config, CALENDAR_CONFIG_DN_SHOW_WEEK_NUMBERS, func, data, NULL, NULL); - - return id; -} - /* The positions of the panes in the normal and month views. */ void calendar_config_set_hpane_pos (gint hpane_pos) @@ -403,18 +358,6 @@ calendar_config_set_tasks_selected (GSList *selected) gconf_client_set_list (config, CALENDAR_CONFIG_TASKS_SELECTED_TASKS, GCONF_VALUE_STRING, selected, NULL); } -guint -calendar_config_add_notification_tasks_selected (GConfClientNotifyFunc func, gpointer data) -{ - guint id; - - calendar_config_init (); - - id = gconf_client_notify_add (config, CALENDAR_CONFIG_TASKS_SELECTED_TASKS, func, data, NULL, NULL); - - return id; -} - /***************************************/ /* The current list of memo lists selected */ @@ -434,18 +377,6 @@ calendar_config_set_memos_selected (GSList *selected) gconf_client_set_list (config, CALENDAR_CONFIG_MEMOS_SELECTED_MEMOS, GCONF_VALUE_STRING, selected, NULL); } -guint -calendar_config_add_notification_memos_selected (GConfClientNotifyFunc func, gpointer data) -{ - guint id; - - calendar_config_init (); - - id = gconf_client_notify_add (config, CALENDAR_CONFIG_MEMOS_SELECTED_MEMOS, func, data, NULL, NULL); - - return id; -} - /***************************************/ /* Whether we compress the weekend in the week/month views. */ @@ -466,18 +397,6 @@ calendar_config_get_working_days (void) return gconf_client_get_int (config, CALENDAR_CONFIG_WORKING_DAYS, NULL); } -guint -calendar_config_add_notification_working_days (GConfClientNotifyFunc func, gpointer data) -{ - guint id; - - calendar_config_init (); - - id = gconf_client_notify_add (config, CALENDAR_CONFIG_WORKING_DAYS , func, data, NULL, NULL); - - return id; -} - /* Settings to hide completed tasks. */ gboolean calendar_config_get_hide_completed_tasks (void) diff --git a/calendar/gui/calendar-config.h b/calendar/gui/calendar-config.h index ff018abeca..191abfa813 100644 --- a/calendar/gui/calendar-config.h +++ b/calendar/gui/calendar-config.h @@ -64,14 +64,12 @@ void calendar_config_remove_notification (guint id); /* The current list of calendars selected */ GSList *calendar_config_get_calendars_selected (void); void calendar_config_set_calendars_selected (GSList *selected); -guint calendar_config_add_notification_calendars_selected (GConfClientNotifyFunc func, gpointer data); /* The current timezone, e.g. "Europe/London". */ icaltimezone *calendar_config_get_icaltimezone (void); /* The working days of the week, a bit-wise combination of flags. */ CalWeekdays calendar_config_get_working_days (void); -guint calendar_config_add_notification_working_days (GConfClientNotifyFunc func, gpointer data); /* The start day of the week (0 = Sun to 6 = Sat). */ gint calendar_config_get_week_start_day (void); @@ -95,15 +93,10 @@ gboolean calendar_config_get_24_hour_format (void); /* The time divisions in the Day/Work-Week view in minutes (5/10/15/30/60). */ gint calendar_config_get_time_divisions (void); void calendar_config_set_time_divisions (gint divisions); -guint calendar_config_add_notification_time_divisions (GConfClientNotifyFunc func, gpointer data); /* Whether we compress the weekend in the week/month views. */ gboolean calendar_config_get_compress_weekend (void); -/* Whether we show week numbers in the Date Navigator. */ -gboolean calendar_config_get_dnav_show_week_no (void); -guint calendar_config_add_notification_dnav_show_week_no (GConfClientNotifyFunc func, gpointer data); - /* The positions of the panes in the normal and month views. */ void calendar_config_set_hpane_pos (gint hpane_pos); @@ -112,12 +105,10 @@ void calendar_config_set_month_hpane_pos (gint hpane_pos); /* The current list of task lists selected */ GSList *calendar_config_get_tasks_selected (void); void calendar_config_set_tasks_selected (GSList *selected); -guint calendar_config_add_notification_tasks_selected (GConfClientNotifyFunc func, gpointer data); /* The current list of memo lists selected */ GSList *calendar_config_get_memos_selected (void); void calendar_config_set_memos_selected (GSList *selected); -guint calendar_config_add_notification_memos_selected (GConfClientNotifyFunc func, gpointer data); /* Settings to hide completed tasks. */ gboolean calendar_config_get_hide_completed_tasks (void); diff --git a/calendar/gui/e-comp-editor-registry.c b/calendar/gui/e-comp-editor-registry.c deleted file mode 100644 index cdbffd4ee4..0000000000 --- a/calendar/gui/e-comp-editor-registry.c +++ /dev/null @@ -1,213 +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 - * - * - * Authors: - * JP Rosevear - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - */ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "e-comp-editor-registry.h" - -struct _ECompEditorRegistryPrivate { - GHashTable *editors; -}; - -struct _ECompEditorRegistryData -{ - ECompEditorRegistry *registry; - CompEditor *editor; - gchar *uid; -}; - -typedef struct _ECompEditorRegistryData ECompEditorRegistryData; -typedef struct _ECompEditorRegistryForeachData ECompEditorRegistryForeachData; - -static void editor_destroy_cb (gpointer data, GObject *where_object_was); - -G_DEFINE_TYPE (ECompEditorRegistry, e_comp_editor_registry, G_TYPE_OBJECT) - -static void -registry_data_free (gpointer data) -{ - ECompEditorRegistryData *rdata = data; - - if (rdata->editor) - g_object_weak_unref (G_OBJECT (rdata->editor), editor_destroy_cb, rdata); - g_free (rdata->uid); - g_free (rdata); -} - -static void -e_comp_editor_registry_dispose (GObject *obj) -{ - ECompEditorRegistry *reg; - ECompEditorRegistryPrivate *priv; - - reg = E_COMP_EDITOR_REGISTRY (obj); - priv = reg->priv; - - if (priv->editors) { - g_hash_table_destroy (priv->editors); - priv->editors = NULL; - } - - (* G_OBJECT_CLASS (e_comp_editor_registry_parent_class)->dispose) (obj); -} - -static void -e_comp_editor_registry_finalize (GObject *obj) -{ - ECompEditorRegistry *reg; - ECompEditorRegistryPrivate *priv; - - reg = E_COMP_EDITOR_REGISTRY (obj); - priv = reg->priv; - - g_free (priv); - - (* G_OBJECT_CLASS (e_comp_editor_registry_parent_class)->finalize) (obj); -} - -static void -e_comp_editor_registry_class_init (ECompEditorRegistryClass *klass) -{ - GObjectClass *object_class; - - object_class = G_OBJECT_CLASS (klass); - - object_class->dispose = e_comp_editor_registry_dispose; - object_class->finalize = e_comp_editor_registry_finalize; -} - -static void -e_comp_editor_registry_init (ECompEditorRegistry *reg) -{ - ECompEditorRegistryPrivate *priv; - - priv = g_new0 (ECompEditorRegistryPrivate, 1); - - reg->priv = priv; - priv->editors = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, registry_data_free); -} - -GObject * -e_comp_editor_registry_new (void) -{ - return g_object_new (E_TYPE_COMP_EDITOR_REGISTRY, NULL); -} - -void -e_comp_editor_registry_add (ECompEditorRegistry *reg, CompEditor *editor, gboolean remote) -{ - ECompEditorRegistryPrivate *priv; - ECompEditorRegistryData *rdata; - ECalComponent *comp; - const gchar *uid; - - g_return_if_fail (reg != NULL); - g_return_if_fail (E_IS_COMP_EDITOR_REGISTRY (reg)); - g_return_if_fail (editor != NULL); - g_return_if_fail (IS_COMP_EDITOR (editor)); - - priv = reg->priv; - - comp = comp_editor_get_comp (editor); - e_cal_component_get_uid (comp, &uid); - - rdata = g_new0 (ECompEditorRegistryData, 1); - - rdata->registry = reg; - rdata->editor = editor; - rdata->uid = g_strdup (uid); - - g_hash_table_insert (priv->editors, g_strdup (uid), rdata); - - /* FIXME Need to know when uid on the editor changes (if the component changes locations) */ - g_object_weak_ref (G_OBJECT (editor), editor_destroy_cb, rdata); -} - -CompEditor * -e_comp_editor_registry_find (ECompEditorRegistry *reg, const gchar *uid) -{ - ECompEditorRegistryPrivate *priv; - ECompEditorRegistryData *rdata; - - g_return_val_if_fail (reg != NULL, NULL); - g_return_val_if_fail (E_IS_COMP_EDITOR_REGISTRY (reg), NULL); - g_return_val_if_fail (uid != NULL, NULL); - - priv = reg->priv; - - rdata = g_hash_table_lookup (priv->editors, uid); - if (rdata != NULL) - return rdata->editor; - - return NULL; -} - -static gboolean -foreach_close_cb (gpointer key, gpointer value, gpointer data) -{ - ECompEditorRegistryData *rdata; - - rdata = value; - - g_signal_handlers_block_matched (rdata->editor, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, data); - - gtk_window_present (GTK_WINDOW (rdata->editor)); - if (!comp_editor_close (rdata->editor)) { - g_signal_handlers_unblock_matched (rdata->editor, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, data); - return FALSE; - } - - g_free (rdata->uid); - g_free (rdata); - - return TRUE; -} - -gboolean -e_comp_editor_registry_close_all (ECompEditorRegistry *reg) -{ - ECompEditorRegistryPrivate *priv; - - g_return_val_if_fail (reg != NULL, FALSE); - g_return_val_if_fail (E_IS_COMP_EDITOR_REGISTRY (reg), FALSE); - - priv = reg->priv; - - g_hash_table_foreach_remove (priv->editors, foreach_close_cb, reg); - if (g_hash_table_size (priv->editors) != 0) - return FALSE; - - return TRUE; -} - -static void -editor_destroy_cb (gpointer data, GObject *where_object_was) -{ - ECompEditorRegistryData *rdata = data; - - /* We null it out because its dead, so we won't try to weak - * unref it in the hash destroyer */ - rdata->editor = NULL; - g_hash_table_remove (rdata->registry->priv->editors, rdata->uid); -} diff --git a/calendar/gui/e-comp-editor-registry.h b/calendar/gui/e-comp-editor-registry.h deleted file mode 100644 index 3f9d195666..0000000000 --- a/calendar/gui/e-comp-editor-registry.h +++ /dev/null @@ -1,72 +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 - * - * - * Authors: - * JP Rosevear - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - */ - -#ifndef _E_COMP_EDITOR_REGISTRY_H_ -#define _E_COMP_EDITOR_REGISTRY_H_ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include -#include - -G_BEGIN_DECLS - -#define E_TYPE_COMP_EDITOR_REGISTRY (e_comp_editor_registry_get_type ()) -#define E_COMP_EDITOR_REGISTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_COMP_EDITOR_REGISTRY, ECompEditorRegistry)) -#define E_COMP_EDITOR_REGISTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_COMP_EDITOR_REGISTRY, ECompEditorRegistryClass)) -#define E_IS_COMP_EDITOR_REGISTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_COMP_EDITOR_REGISTRY)) -#define E_IS_COMP_EDITOR_REGISTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), E_TYPE_COMP_EDITOR_REGISTRY)) - - -typedef struct _ECompEditorRegistry ECompEditorRegistry; -typedef struct _ECompEditorRegistryPrivate ECompEditorRegistryPrivate; -typedef struct _ECompEditorRegistryClass ECompEditorRegistryClass; - -struct _ECompEditorRegistry { - GObject parent; - - ECompEditorRegistryPrivate *priv; -}; - -struct _ECompEditorRegistryClass { - GObjectClass parent_class; -}; - -typedef void (* ECompEditorRegistryForeachFn) (CompEditor *editor, gpointer data); - - - -GType e_comp_editor_registry_get_type (void); -GObject *e_comp_editor_registry_new (void); -void e_comp_editor_registry_add (ECompEditorRegistry *reg, - CompEditor *editor, - gboolean remote); -CompEditor *e_comp_editor_registry_find (ECompEditorRegistry *reg, - const gchar *uid); -gboolean e_comp_editor_registry_close_all (ECompEditorRegistry *reg); - -G_END_DECLS - -#endif /* _E_COMP_EDITOR_REGISTRY_H_ */ - diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c index bcdb27a6d9..6f4e3f379d 100644 --- a/calendar/gui/gnome-cal.c +++ b/calendar/gui/gnome-cal.c @@ -49,7 +49,6 @@ #include "e-util/e-error.h" #include "e-util/e-util-private.h" #include "shell/e-shell.h" -#include "e-comp-editor-registry.h" #include "dialogs/delete-error.h" #include "dialogs/event-editor.h" #include "comp-util.h" -- cgit