diff options
Diffstat (limited to 'calendar/gui')
| -rw-r--r-- | calendar/gui/alarm-notify/alarm.c | 3 | ||||
| -rw-r--r-- | calendar/gui/alarm.c | 3 | ||||
| -rw-r--r-- | calendar/gui/main.c | 15 |
3 files changed, 11 insertions, 10 deletions
diff --git a/calendar/gui/alarm-notify/alarm.c b/calendar/gui/alarm-notify/alarm.c index 085111498b..087ec518bc 100644 --- a/calendar/gui/alarm-notify/alarm.c +++ b/calendar/gui/alarm-notify/alarm.c @@ -252,6 +252,8 @@ alarm_remove (gpointer alarm) AlarmRecord *old_head; GList *l; + g_return_if_fail (alarm != NULL); + ar = alarm; l = g_list_find (alarms, ar); @@ -277,7 +279,6 @@ alarm_remove (gpointer alarm) /** * alarm_init: - * @void: * * Initializes the alarm notification system. This must be called near the * beginning of the program. diff --git a/calendar/gui/alarm.c b/calendar/gui/alarm.c index 085111498b..087ec518bc 100644 --- a/calendar/gui/alarm.c +++ b/calendar/gui/alarm.c @@ -252,6 +252,8 @@ alarm_remove (gpointer alarm) AlarmRecord *old_head; GList *l; + g_return_if_fail (alarm != NULL); + ar = alarm; l = g_list_find (alarms, ar); @@ -277,7 +279,6 @@ alarm_remove (gpointer alarm) /** * alarm_init: - * @void: * * Initializes the alarm notification system. This must be called near the * beginning of the program. diff --git a/calendar/gui/main.c b/calendar/gui/main.c index f34ac4518f..4f28031201 100644 --- a/calendar/gui/main.c +++ b/calendar/gui/main.c @@ -28,7 +28,6 @@ #include <gnome.h> #include <glade/glade.h> #include <bonobo.h> -#include <bonobo/bonobo-control.h> #include <glade/glade.h> #include <liboaf/liboaf.h> @@ -42,13 +41,13 @@ #include "e-itip-control.h" static void -init_bonobo (int *argc, char **argv) +init_bonobo (int argc, char **argv) { - /* FIXME: VERSION instead of "0.0". */ - gnome_init_with_popt_table ("evolution-calendar", "0.0", - *argc, argv, oaf_popt_options, - 0, NULL); - oaf_init (*argc, argv); + if (gnome_init_with_popt_table ("evolution-calendar", VERSION, argc, argv, + oaf_popt_options, 0, NULL) != 0) + g_error (_("Could not initialize GNOME")); + + oaf_init (argc, argv); if (bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE) g_error (_("Could not initialize Bonobo")); @@ -61,7 +60,7 @@ main (int argc, char **argv) bindtextdomain(PACKAGE, EVOLUTION_LOCALEDIR); textdomain(PACKAGE); - init_bonobo (&argc, argv); + init_bonobo (argc, argv); glade_gnome_init (); alarm_init (); e_cursors_init (); |