0004-drop-support-for-commandline-based-calendar-tasks-ap.patch

   1 From 452f59be8f9babf0ae33654e754da65151760a76 Mon Sep 17 00:00:00 2001
   2 From: Philipp Kaluza <phk@src.gnome.org>
   3 Date: Fri, 8 Mar 2013 17:51:23 +0100
   4 Subject: [PATCH 4/6] drop support for commandline-based calendar/tasks
   5  applications
   6
   7 It's not worth the layering violations this would need.
   8 (Partial fix for bug #237308 .)
   9 ---
  10  applets/clock/calendar-window.c | 13 +++++++------
  11  1 file changed, 7 insertions(+), 6 deletions(-)
  12
  13 diff --git a/applets/clock/calendar-window.c b/applets/clock/calendar-window.c
  14 index 458852c..708e921 100644
  15 --- a/applets/clock/calendar-window.c
  16 +++ b/applets/clock/calendar-window.c
  17 @@ -42,9 +42,6 @@
  18  #include <glib/gi18n.h>
  19  #include <gio/gio.h>
  20
  21 -#define GNOME_DESKTOP_USE_UNSTABLE_API
  22 -#include <libgnome-desktop/gnome-desktop-utils.h>
  23 -
  24  #include "calendar-window.h"
  25
  26  #include "clock.h"
  27 @@ -168,6 +165,13 @@ clock_launch_calendar_tasks_app (CalendarWindow *calwin,
  28                 return;
  29         }
  30
  31 +       /* FIXME: reintroduce terminal support if a proper GAppInfo port of gnome-panel is ever done */
  32 +       if (terminal) {
  33 +               g_printerr ("Terminal-based calendar/tasks applications are no longer supported, sorry. "
  34 +                           "Please configure a different application.\n");
  35 +               return;
  36 +       }
  37 +
  38         command_line = g_find_program_in_path (program);
  39         if (command_line == NULL) {
  40                 g_printerr ("Cannot launch calendar/tasks application: %s in path\n", program);
  41 @@ -189,9 +193,6 @@ clock_launch_calendar_tasks_app (CalendarWindow *calwin,
  42         screen = gtk_widget_get_screen (calwin->priv->calendar);
  43         error = NULL;
  44
  45 -       if (terminal)
  46 -               gnome_desktop_prepend_terminal_to_vector (&argc, &argv);
  47 -
  48         display = gdk_screen_make_display_name (screen);
  49
  50         result = g_spawn_async (NULL, /* working directory */
  51 --
  52 1.8.2
  53