← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/gnome-panel/oneiric

« back to all changes in this revision

Viewing changes to applets/clock/calendar-window.c

  • Committer: Package Import Robot
  • Author(s): Sebastien Bacher
  • Date: 2011-09-26 11:24:36 UTC
  • mfrom: (1.13.13 upstream)
  • Revision ID: package-import@ubuntu.com-20110926112436-72x6ro8jhmjlwtko
Tags: 1:3.2.0-0ubuntu1
New upstream version

Show diffs side-by-side

added added

removed removed

Lines of Context:
applets/clock/calendar-window.c
65
65
#  define KEY_TASKS_EXPANDED        "expand_tasks"
66
66
#  define KEY_WEATHER_EXPANDED      "expand_weather"
67
67
 
68
 
#  define KEY_CALENDAR_APP          "/desktop/gnome/applications/calendar"
69
 
#  define KEY_TASKS_APP             "/desktop/gnome/applications/tasks"
 
68
#  define SCHEMA_CALENDAR_APP       "org.gnome.desktop.default-applications.office.calendar"
 
69
#  define SCHEMA_TASKS_APP          "org.gnome.desktop.default-applications.office.tasks"
70
70
#else
71
71
#  define N_CALENDAR_WINDOW_GCONF_PREFS 1
72
72
#endif
158
158
 
159
159
static void
160
160
clock_launch_calendar_tasks_app (CalendarWindow *calwin,
161
 
                                 const char     *key_program,
 
161
                                 const char     *schema_program,
162
162
                                 const char     *argument)
163
163
{
 
164
        GSettings  *settings;
164
165
        char      **argv;
165
166
        int         argc;
166
 
        char       *key;
167
167
        char       *program;
168
168
        gboolean    terminal;
169
169
        char       *command_line;
172
172
        gboolean    result;
173
173
        char       *display;
174
174
 
175
 
        key = g_strdup_printf ("%s%s", key_program, "/exec");
176
 
        program = gconf_client_get_string (calwin->priv->gconfclient,
177
 
                                           key, NULL);
178
 
        g_free (key);
179
 
 
180
 
        key = g_strdup_printf ("%s%s", key_program, "/needs_term");
181
 
        terminal = gconf_client_get_bool (calwin->priv->gconfclient,
182
 
                                          key, NULL);
183
 
        g_free (key);
 
175
        settings = g_settings_new (schema_program);
 
176
        program = g_settings_get_string (settings, "exec");
 
177
        terminal = g_settings_get_boolean (settings, "needs-term");
 
178
        g_object_unref (settings);
184
179
 
185
180
        if (program == NULL) {
186
181
                g_printerr ("Cannot launch calendar/tasks application: key not set\n");
237
232
clock_launch_calendar_app (CalendarWindow *calwin,
238
233
                           const char     *argument)
239
234
{
240
 
        clock_launch_calendar_tasks_app (calwin, KEY_CALENDAR_APP, argument);
 
235
        clock_launch_calendar_tasks_app (calwin, SCHEMA_CALENDAR_APP, argument);
241
236
}
242
237
 
243
238
static void
244
239
clock_launch_tasks_app (CalendarWindow *calwin,
245
240
                        const char     *argument)
246
241
{
247
 
        clock_launch_calendar_tasks_app (calwin, KEY_TASKS_APP, argument);
 
242
        clock_launch_calendar_tasks_app (calwin, SCHEMA_TASKS_APP, argument);
248
243
}
249
244
 
250
245
static void