diff options
Diffstat (limited to 'calendar')
-rw-r--r-- | calendar/gui/alarm-notify/alarm-queue.c | 10 | ||||
-rw-r--r-- | calendar/gui/e-cal-list-view.c | 1 | ||||
-rw-r--r-- | calendar/gui/e-day-view.c | 1 | ||||
-rw-r--r-- | calendar/gui/e-meeting-time-sel.c | 1 | ||||
-rw-r--r-- | calendar/gui/e-week-view.c | 1 |
5 files changed, 3 insertions, 11 deletions
diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c index d30f2550f0..17c743126a 100644 --- a/calendar/gui/alarm-notify/alarm-queue.c +++ b/calendar/gui/alarm-notify/alarm-queue.c @@ -34,7 +34,6 @@ #include <bonobo/bonobo-main.h> #include <gtk/gtk.h> #include <glib/gi18n.h> -#include <libgnome/gnome-exec.h> #include <libgnome/gnome-sound.h> #include <libecal/e-cal-time-util.h> @@ -1761,7 +1760,7 @@ procedure_notification (time_t trigger, CompQueuedAlarms *cqa, gpointer alarm_id icalattach *attach; const char *url; char *cmd; - int result; + gboolean result = TRUE; d(printf("%s:%d (procedure_notification)\n",__FILE__, __LINE__)); @@ -1795,9 +1794,8 @@ procedure_notification (time_t trigger, CompQueuedAlarms *cqa, gpointer alarm_id else cmd = (char *) url; - result = 0; if (procedure_notification_dialog (cmd, url)) - result = gnome_execute_shell (NULL, cmd); + result = g_spawn_command_line_async (cmd, NULL); if (cmd != (char *) url) g_free (cmd); @@ -1805,7 +1803,7 @@ procedure_notification (time_t trigger, CompQueuedAlarms *cqa, gpointer alarm_id icalattach_unref (attach); /* Fall back to display notification if we got an error */ - if (result < 0) + if (result == FALSE) goto fallback; return; @@ -1815,8 +1813,6 @@ procedure_notification (time_t trigger, CompQueuedAlarms *cqa, gpointer alarm_id display_notification (trigger, cqa, alarm_id, FALSE); } - - static gboolean check_midnight_refresh (gpointer user_data) { diff --git a/calendar/gui/e-cal-list-view.c b/calendar/gui/e-cal-list-view.c index cfb77f8066..6c71d1c8c7 100644 --- a/calendar/gui/e-cal-list-view.c +++ b/calendar/gui/e-cal-list-view.c @@ -42,7 +42,6 @@ #include <table/e-cell-combo.h> #include <misc/e-popup-menu.h> #include <misc/e-cell-date-edit.h> -#include <libgnome/gnome-exec.h> #include <e-util/e-categories-config.h> #include <e-util/e-dialog-utils.h> #include <e-util/e-util-private.h> diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c index 6a07d9790a..9f48cdecb1 100644 --- a/calendar/gui/e-day-view.c +++ b/calendar/gui/e-day-view.c @@ -38,7 +38,6 @@ #include <misc/e-unicode.h> #include <libgnomecanvas/gnome-canvas-rect-ellipse.h> #include <glib/gi18n.h> -#include <libgnome/gnome-exec.h> #include <e-util/e-categories-config.h> #include <e-util/e-dialog-utils.h> diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c index fdf73c49be..625d24d600 100644 --- a/calendar/gui/e-meeting-time-sel.c +++ b/calendar/gui/e-meeting-time-sel.c @@ -32,7 +32,6 @@ #include <string.h> #include <time.h> #include <gdk/gdkkeysyms.h> -#include <libgnomeui/gnome-dateedit.h> #include <glib/gi18n.h> #include <libgnomecanvas/gnome-canvas-widget.h> diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c index 2120d024d0..80248ec771 100644 --- a/calendar/gui/e-week-view.c +++ b/calendar/gui/e-week-view.c @@ -35,7 +35,6 @@ #include <math.h> #include <gdk/gdkkeysyms.h> #include <glib/gi18n.h> -#include <libgnome/gnome-exec.h> #include <libgnomecanvas/gnome-canvas-pixbuf.h> #include <text/e-text.h> #include <misc/e-canvas-utils.h> |