aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/gui/main.c
diff options
context:
space:
mode:
authorFederico Mena Quintero <federico@helixcode.com>2000-12-20 02:12:57 +0800
committerFederico Mena Quintero <federico@src.gnome.org>2000-12-20 02:12:57 +0800
commitde861766eded0c80ffbe050088043a16d7e4923f (patch)
tree5010fda36af306efaab59e11ebfa12b7bd43023a /calendar/gui/main.c
parent20dabfff3014eb67b5c930345e8cb64116dba374 (diff)
downloadgsoc2013-evolution-de861766eded0c80ffbe050088043a16d7e4923f.tar
gsoc2013-evolution-de861766eded0c80ffbe050088043a16d7e4923f.tar.gz
gsoc2013-evolution-de861766eded0c80ffbe050088043a16d7e4923f.tar.bz2
gsoc2013-evolution-de861766eded0c80ffbe050088043a16d7e4923f.tar.lz
gsoc2013-evolution-de861766eded0c80ffbe050088043a16d7e4923f.tar.xz
gsoc2013-evolution-de861766eded0c80ffbe050088043a16d7e4923f.tar.zst
gsoc2013-evolution-de861766eded0c80ffbe050088043a16d7e4923f.zip
Fix confusion in the way the range is expanded.
2000-12-19 Federico Mena Quintero <federico@helixcode.com> * pcs/cal-backend-file.c (compute_alarm_range): Fix confusion in the way the range is expanded. * cal-util/cal-component.c (cal_component_alarms_free): Doh, alarms->alarms is a list, not a generic pointer. Free it properly. (cal_component_free_pilot_id): Removed unused function. (cal_component_free_pilot_status): Likewise. * gui/main.c (init_bonobo): Use VERSION instead of a hardcoded string. Pass argc by value, not by reference. Test the return value of gnome_init_with_popt_table(). * cal-client/cal-client.c (cal_client_free_alarms): Oops, missed implementing this function. * cal-util/timeutil.c (print_time_t): Better printing format. (isodiff_to_secs): Removed unused function. (isodiff_from_secs): Removed unused function. (time_day_end): Removed crufty part. (time_day_begin): Removed crufty part. (time_day_hour): Removed unused function. (format_simple_hour): Removed unused function. (get_time_t_hour): Removed unused function. (time_from_start_duration): Removed unused function. * cal-util/timeutil.h (parse_date): Removed unimplemented, unused function prototype. svn path=/trunk/; revision=7083
Diffstat (limited to 'calendar/gui/main.c')
-rw-r--r--calendar/gui/main.c15
1 files changed, 7 insertions, 8 deletions
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 ();