From 8cf036faffe5985d34c310ee89b133200380b757 Mon Sep 17 00:00:00 2001
From: Adam Petaccia <adam@tpetaccia.com>
Date: Wed, 6 May 2009 11:01:32 -0400
Subject: =?UTF-8?q?Bug=20571496=20=E2=80=93=20Migrate=20from=20deprecated?=
 =?UTF-8?q?=20gnome=5Fexecute=20to=20g=5Fspawn/xdg-terminal?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 calendar/gui/alarm-notify/alarm-queue.c | 10 +++-------
 calendar/gui/e-cal-list-view.c          |  1 -
 calendar/gui/e-day-view.c               |  1 -
 calendar/gui/e-week-view.c              |  1 -
 4 files changed, 3 insertions(+), 10 deletions(-)

(limited to 'calendar')

diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c
index f3167d813c..859b775607 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>
@@ -1759,7 +1758,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__));
 
@@ -1793,9 +1792,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);
@@ -1803,7 +1801,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;
@@ -1813,8 +1811,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 cc9ae353cd..0702d3a297 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 af812edb31..96bc63d592 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-week-view.c b/calendar/gui/e-week-view.c
index 3e5c42725f..264e30271d 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>
-- 
cgit v1.2.3