← Back to branch summary

~ubuntu-branches/ubuntu/precise/evolution/precise

« back to all changes in this revision

Viewing changes to .pc/93_no_tray_icon_by_default.patch/calendar/gui/alarm-notify/config-data.c

  • Committer: Package Import Robot
  • Author(s): Mathieu Trudel-Lapierre
  • Date: 2011-09-08 09:38:57 UTC
  • mfrom: (1.1.84 upstream)
  • Revision ID: package-import@ubuntu.com-20110908093857-6lfl04ke2ns3kx2o
Tags: 3.1.91-0ubuntu1
https://launchpad.net/bugs/843769
* New upstream release. (LP: #843769)
* debian/control: bump e-d-s Build-Depends to 3.1.91. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/93_no_tray_icon_by_default.patch/calendar/gui/alarm-notify/config-data.c
124
124
        state = gconf_client_get_bool (conf_client,
125
125
                                      "/apps/evolution/calendar/notify/notify_with_tray",
126
126
                                      NULL);
127
 
        if (!state) /* Should be old client*/ {
 
127
        if (!state) /* Should be old client */ {
128
128
                GSList *source;
129
129
                gconf_client_set_bool (conf_client,
130
130
                                      "/apps/evolution/calendar/notify/notify_with_tray",
158
158
 
159
159
void
160
160
config_data_replace_string_list (const gchar *key,
161
 
                                 const gchar *old,
162
 
                                 const gchar *new)
 
161
                                 const gchar *old,
 
162
                                 const gchar *new)
163
163
{
164
164
        GSList *source, *tmp;
165
165
 
259
259
 * triggered while it was not running.
260
260
 **/
261
261
void
262
 
config_data_set_last_notification_time (ECalClient *cal, time_t t)
 
262
config_data_set_last_notification_time (ECalClient *cal,
 
263
                                        time_t t)
263
264
{
264
265
        GConfClient *client;
265
266
        time_t current_t, now = time (NULL);
287
288
                return;
288
289
 
289
290
        /* we only store the new notification time if it is bigger
290
 
           than the already stored one */
 
291
         * than the already stored one */
291
292
        current_t = gconf_client_get_int (client, KEY_LAST_NOTIFICATION_TIME, NULL);
292
293
        if (t > current_t || current_t > now)
293
294
                gconf_client_set_int (client, KEY_LAST_NOTIFICATION_TIME, t, NULL);