← Back to branch summary

~ubuntu-branches/ubuntu/karmic/evolution/karmic-proposed

« back to all changes in this revision

Viewing changes to calendar/gui/alarm-notify/alarm-queue.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2009-10-19 11:28:09 UTC
  • mfrom: (1.1.69 upstream)
  • Revision ID: james.westby@ubuntu.com-20091019112809-dm58mhdd7mkedv4h
Tags: 2.28.1-0ubuntu1
https://launchpad.net/bugs/442250
https://launchpad.net/bugs/437755
https://launchpad.net/bugs/452921
* New upstream version:
  Bug Fixes:
  - #552552 - File/Empty Trash does not expunge maildir folder    
  - #592117 - Calendar printout love
  - #592313 - Default label names untranslated (lp: #442250)
  - #594373 - Calendar notifications are not cleared from system tray    
              (lp: #437755)
  - #595501 - Crash on a changed filter rule removal (lp: #452921)
  - #595923 - Fix user doc compilation warnings 
  - #595938 - User doc clean up 
  - #596130 - Use correct Name and GenericName in .desktop file    
  - #596157 - Use "Message-ID" instead of "Message-Id" 
  - #596160 - Compiler warnings about _MailComponentPrivate.quit_state    
  - #596712 - Recovered messages not autosaved until modification
  - #596800 - Hang on contacts merging 
  - #597108 - E_CONFIG_SECTION headers not properly escaped    
  - #597564 - Invalid g_object_unref call in redo_queries 
  Miscellaneous:
  Disable gdk_event_get_graphics_expose
  Various composer autosave fixes. 
* debian/patches/90_autoconf.patch:
  - new version update

Show diffs side-by-side

added added

removed removed

Lines of Context:
calendar/gui/alarm-notify/alarm-queue.c
947
947
        ECalComponent *comp;
948
948
        ECal *client;
949
949
        ECalView *query;
950
 
        GtkStatusIcon *tray_icon;
951
950
        GdkPixbuf *image;
952
951
        GtkTreeIter iter;
953
952
} TrayIconData;
985
984
 
986
985
        tray_data->cqa = NULL;
987
986
        tray_data->alarm_id = NULL;
988
 
        tray_data->tray_icon = NULL;
989
987
        tray_data->image = NULL;
990
988
 
991
989
        g_free (tray_data);
1262
1260
        return;
1263
1261
}
1264
1262
 
 
1263
static void
 
1264
remove_tray_icon (void)
 
1265
{
 
1266
        if (tray_blink_id > -1)
 
1267
                g_source_remove (tray_blink_id);
 
1268
        tray_blink_id = -1;
 
1269
 
 
1270
        if (tray_icon) {
 
1271
                gtk_status_icon_set_visible (tray_icon, FALSE);
 
1272
                g_object_unref (tray_icon);
 
1273
                tray_icon = NULL;
 
1274
        }
 
1275
}
 
1276
 
1265
1277
/* Callbacks.  */
1266
1278
static gboolean
1267
1279
open_alarm_dialog (TrayIconData *tray_data)
1271
1283
        d(printf("%s:%d (open_alarm_dialog) \n",__FILE__, __LINE__));
1272
1284
        qa = lookup_queued_alarm (tray_data->cqa, tray_data->alarm_id);
1273
1285
        if (qa) {
1274
 
 
1275
 
                if (tray_blink_id > -1)
1276
 
                        g_source_remove (tray_blink_id);
1277
 
                tray_blink_id = -1;
1278
 
 
1279
 
                g_object_unref (tray_icon);
1280
 
                tray_icon = NULL;
 
1286
                remove_tray_icon ();
1281
1287
 
1282
1288
                if (!alarm_notifications_dialog)
1283
1289
                        alarm_notifications_dialog = notified_alarms_dialog_new ();
1304
1310
 
1305
1311
                }
1306
1312
 
 
1313
        } else {
 
1314
                remove_tray_icon ();
1307
1315
        }
1308
1316
 
1309
1317
        return TRUE;
1323
1331
                        return TRUE;
1324
1332
                } else if (event->button == 3) {
1325
1333
                        d(printf("%s:%d (tray_icon_clicked_cb) - right click\n",__FILE__, __LINE__));
1326
 
                        if (tray_blink_id > -1)
1327
 
                                g_source_remove (tray_blink_id);
1328
 
                        tray_blink_id = -1;
1329
1334
 
1330
 
                        gtk_status_icon_set_visible (tray_icon, FALSE);
1331
 
                        g_object_unref (tray_icon);
1332
 
                        tray_icon = NULL;
 
1335
                        remove_tray_icon ();
1333
1336
                        return TRUE;
1334
1337
                }
1335
1338
        }
1468
1471
                                  G_CALLBACK (icon_activated), NULL);
1469
1472
                g_signal_connect (G_OBJECT (tray_icon), "popup-menu",
1470
1473
                                  G_CALLBACK (popup_menu), NULL);
1471
 
 
1472
1474
        }
1473
1475
 
1474
1476
        current_zone = config_data_get_timezone ();
1494
1496
        tray_data->blink_state = FALSE;
1495
1497
        tray_data->snooze_set = FALSE;
1496
1498
        g_object_ref (tray_data->client);
1497
 
        tray_data->tray_icon = tray_icon;
1498
1499
 
1499
1500
        /* Task to add tray_data to the global tray_icon_list */
1500
1501
        tray_list_add_new (tray_data);