aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFederico Mena Quintero <federico@ximian.com>2001-09-18 06:24:29 +0800
committerFederico Mena Quintero <federico@src.gnome.org>2001-09-18 06:24:29 +0800
commited0347eacebd893fc25221d55fa3040b4248ce2e (patch)
tree63c5a082422e12209916f68891871824e1a45454
parent7796aa195e6ae1f3da3410d66a103145e10cd460 (diff)
downloadgsoc2013-evolution-ed0347eacebd893fc25221d55fa3040b4248ce2e.tar
gsoc2013-evolution-ed0347eacebd893fc25221d55fa3040b4248ce2e.tar.gz
gsoc2013-evolution-ed0347eacebd893fc25221d55fa3040b4248ce2e.tar.bz2
gsoc2013-evolution-ed0347eacebd893fc25221d55fa3040b4248ce2e.tar.lz
gsoc2013-evolution-ed0347eacebd893fc25221d55fa3040b4248ce2e.tar.xz
gsoc2013-evolution-ed0347eacebd893fc25221d55fa3040b4248ce2e.tar.zst
gsoc2013-evolution-ed0347eacebd893fc25221d55fa3040b4248ce2e.zip
Do not call calendar_config_init() here.
2001-09-17 Federico Mena Quintero <federico@ximian.com> * gui/component-factory.c (owner_set_cb): Do not call calendar_config_init() here. * gui/main.c (main): Call calendar_config_init() here. svn path=/trunk/; revision=12916
-rw-r--r--calendar/ChangeLog7
-rw-r--r--calendar/gui/calendar-component.c3
-rw-r--r--calendar/gui/component-factory.c3
-rw-r--r--calendar/gui/main.c2
4 files changed, 9 insertions, 6 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index d1f4b4e41c..2224e510f6 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,5 +1,12 @@
2001-09-17 Federico Mena Quintero <federico@ximian.com>
+ * gui/component-factory.c (owner_set_cb): Do not call
+ calendar_config_init() here.
+
+ * gui/main.c (main): Call calendar_config_init() here.
+
+2001-09-17 Federico Mena Quintero <federico@ximian.com>
+
* gui/alarm-notify/alarm.c (queue_alarm): Duh, only setup the
timeout if the list was empty.
(alarm_ready_cb): Notify with the ID of the original alarm.
diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c
index 5954cf88d9..786aa70003 100644
--- a/calendar/gui/calendar-component.c
+++ b/calendar/gui/calendar-component.c
@@ -52,7 +52,6 @@
#define CREATE_EVENT_ID "event"
#define CREATE_TASK_ID "task"
-static BonoboGenericFactory *factory = NULL;
char *evolution_dir;
static const EvolutionShellComponentFolderType folder_types[] = {
@@ -335,8 +334,6 @@ owner_set_cb (EvolutionShellComponent *shell_component,
evolution_dir = g_strdup (evolution_homedir);
- calendar_config_init ();
-
if (!migrated) {
tasks_migrate ();
migrated = TRUE;
diff --git a/calendar/gui/component-factory.c b/calendar/gui/component-factory.c
index 5954cf88d9..786aa70003 100644
--- a/calendar/gui/component-factory.c
+++ b/calendar/gui/component-factory.c
@@ -52,7 +52,6 @@
#define CREATE_EVENT_ID "event"
#define CREATE_TASK_ID "task"
-static BonoboGenericFactory *factory = NULL;
char *evolution_dir;
static const EvolutionShellComponentFolderType folder_types[] = {
@@ -335,8 +334,6 @@ owner_set_cb (EvolutionShellComponent *shell_component,
evolution_dir = g_strdup (evolution_homedir);
- calendar_config_init ();
-
if (!migrated) {
tasks_migrate ();
migrated = TRUE;
diff --git a/calendar/gui/main.c b/calendar/gui/main.c
index 179f874173..56b8550621 100644
--- a/calendar/gui/main.c
+++ b/calendar/gui/main.c
@@ -115,6 +115,8 @@ main (int argc, char **argv)
G_LOG_LEVEL_WARNING);
#endif
+ calendar_config_init ();
+
control_factory_init ();
component_factory_init ();
itip_control_factory_init ();