aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilan Crha <mcrha@src.gnome.org>2007-07-26 17:25:54 +0800
committerMilan Crha <mcrha@src.gnome.org>2007-07-26 17:25:54 +0800
commit29b6bd175af679d0a499011833130789030e18b5 (patch)
tree72b43f018d86443c182873dbf0bd719dfada908b
parentebbe5a9fa3421f2004b90d2c5c7a7496ffc8c5a7 (diff)
downloadgsoc2013-evolution-29b6bd175af679d0a499011833130789030e18b5.tar.gz
gsoc2013-evolution-29b6bd175af679d0a499011833130789030e18b5.tar.zst
gsoc2013-evolution-29b6bd175af679d0a499011833130789030e18b5.zip
2007-07-26 mcrha Fix for bug #273699
svn path=/trunk/; revision=33843
-rw-r--r--calendar/ChangeLog7
-rw-r--r--calendar/gui/alarm-notify/notify-main.c6
2 files changed, 11 insertions, 2 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 91c449497f..7927f63e94 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,10 @@
+2007-07-26 Milan Crha <mcrha@redhat.com>
+
+ ** Fix for bug #273699
+
+ * gui/alarm-notify/notify-main.c: (main):
+ Do g_warning instead of g_error when factory could not be created.
+
2007-07-18 Hiroyuki Ikezoe <poincare@ikezoe.net>
* gui/cal-search-bar.c: (cal_search_bar_construct): Remove "/" as
diff --git a/calendar/gui/alarm-notify/notify-main.c b/calendar/gui/alarm-notify/notify-main.c
index 4b7c563319..05c421fa71 100644
--- a/calendar/gui/alarm-notify/notify-main.c
+++ b/calendar/gui/alarm-notify/notify-main.c
@@ -149,8 +149,10 @@ main (int argc, char **argv)
factory = bonobo_generic_factory_new ("OAFIID:GNOME_Evolution_Calendar_AlarmNotify_Factory:" BASE_VERSION,
(BonoboFactoryCallback) alarm_notify_factory_fn, NULL);
- if (!factory)
- g_error (_("Could not create the alarm notify service factory"));
+ if (!factory) {
+ g_warning (_("Could not create the alarm notify service factory, maybe it's already running..."));
+ return 1;
+ }
init_session ();