From 9f143e40d168c4e34433067735bcd5f7787dccf1 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 1 Nov 2010 11:40:59 +0100 Subject: stock_appontment-reminder icons renamed (reverts previous commit) --- calendar/gui/alarm-notify/alarm-queue.c | 10 +++++----- data/icons/Makefile.am | 10 ---------- ...olor_status_16x16_stock_appointment-reminder-excl.png | Bin 1007 -> 0 bytes .../hicolor_status_16x16_stock_appointment-reminder.png | Bin 969 -> 0 bytes ...olor_status_22x22_stock_appointment-reminder-excl.png | Bin 1641 -> 0 bytes .../hicolor_status_22x22_stock_appointment-reminder.png | Bin 1609 -> 0 bytes ...olor_status_24x24_stock_appointment-reminder-excl.png | Bin 1741 -> 0 bytes .../hicolor_status_24x24_stock_appointment-reminder.png | Bin 1672 -> 0 bytes ...olor_status_32x32_stock_appointment-reminder-excl.png | Bin 2620 -> 0 bytes .../hicolor_status_32x32_stock_appointment-reminder.png | Bin 2881 -> 0 bytes ...olor_status_48x48_stock_appointment-reminder-excl.png | Bin 4931 -> 0 bytes .../hicolor_status_48x48_stock_appointment-reminder.png | Bin 5216 -> 0 bytes 12 files changed, 5 insertions(+), 15 deletions(-) delete mode 100644 data/icons/hicolor_status_16x16_stock_appointment-reminder-excl.png delete mode 100644 data/icons/hicolor_status_16x16_stock_appointment-reminder.png delete mode 100644 data/icons/hicolor_status_22x22_stock_appointment-reminder-excl.png delete mode 100644 data/icons/hicolor_status_22x22_stock_appointment-reminder.png delete mode 100644 data/icons/hicolor_status_24x24_stock_appointment-reminder-excl.png delete mode 100644 data/icons/hicolor_status_24x24_stock_appointment-reminder.png delete mode 100644 data/icons/hicolor_status_32x32_stock_appointment-reminder-excl.png delete mode 100644 data/icons/hicolor_status_32x32_stock_appointment-reminder.png delete mode 100644 data/icons/hicolor_status_48x48_stock_appointment-reminder-excl.png delete mode 100644 data/icons/hicolor_status_48x48_stock_appointment-reminder.png diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c index 752ce3749e..e8b3f86201 100644 --- a/calendar/gui/alarm-notify/alarm-queue.c +++ b/calendar/gui/alarm-notify/alarm-queue.c @@ -1390,9 +1390,9 @@ tray_icon_blink_cb (gpointer data) tray_blink_state = !tray_blink_state; if (tray_blink_state || tray_blink_countdown <= 0) - icon_name = "stock_appointment-reminder-excl"; + icon_name = "appointment-missed"; else - icon_name = "stock_appointment-reminder"; + icon_name = "appointment-soon"; if (tray_icon) gtk_status_icon_set_from_icon_name (tray_icon, icon_name); @@ -1479,7 +1479,7 @@ display_notification (time_t trigger, CompQueuedAlarms *cqa, if (tray_icon == NULL) { tray_icon = gtk_status_icon_new (); gtk_status_icon_set_from_icon_name ( - tray_icon, "stock_appointment-reminder"); + tray_icon, "appointment-soon"); g_signal_connect (G_OBJECT (tray_icon), "activate", G_CALLBACK (icon_activated), NULL); g_signal_connect (G_OBJECT (tray_icon), "popup-menu", @@ -1607,9 +1607,9 @@ popup_notification (time_t trigger, CompQueuedAlarms *cqa, } #ifdef HAVE_LIBNOTIFY_07 - n = notify_notification_new (summary, body, "stock_appointment-reminder"); + n = notify_notification_new (summary, body, "appointment-soon"); #else - n = notify_notification_new (summary, body, "stock_appointment-reminder", NULL); + n = notify_notification_new (summary, body, "appointment-soon", NULL); #endif /* HAVE_LIBNOTIFY_07 */ if (!notify_notification_show (n, NULL)) g_warning ("Could not send notification to daemon\n"); diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am index c95d4be0d0..caf61d344f 100644 --- a/data/icons/Makefile.am +++ b/data/icons/Makefile.am @@ -190,16 +190,6 @@ stock_private_icons = \ hicolor_status_48x48_stock_signature-bad.png \ hicolor_status_48x48_stock_signature-ok.png \ hicolor_status_48x48_stock_signature.png \ - hicolor_status_16x16_stock_appointment-reminder.png \ - hicolor_status_16x16_stock_appointment-reminder-excl.png \ - hicolor_status_22x22_stock_appointment-reminder.png \ - hicolor_status_22x22_stock_appointment-reminder-excl.png \ - hicolor_status_24x24_stock_appointment-reminder.png \ - hicolor_status_24x24_stock_appointment-reminder-excl.png \ - hicolor_status_32x32_stock_appointment-reminder.png \ - hicolor_status_32x32_stock_appointment-reminder-excl.png \ - hicolor_status_48x48_stock_appointment-reminder.png \ - hicolor_status_48x48_stock_appointment-reminder-excl.png \ $(NULL) # hicolor_status_16x16_wrapped.png was copied from Firefox diff --git a/data/icons/hicolor_status_16x16_stock_appointment-reminder-excl.png b/data/icons/hicolor_status_16x16_stock_appointment-reminder-excl.png deleted file mode 100644 index 51339f875a..0000000000 Binary files a/data/icons/hicolor_status_16x16_stock_appointment-reminder-excl.png and /dev/null differ diff --git a/data/icons/hicolor_status_16x16_stock_appointment-reminder.png b/data/icons/hicolor_status_16x16_stock_appointment-reminder.png deleted file mode 100644 index 4564284e39..0000000000 Binary files a/data/icons/hicolor_status_16x16_stock_appointment-reminder.png and /dev/null differ diff --git a/data/icons/hicolor_status_22x22_stock_appointment-reminder-excl.png b/data/icons/hicolor_status_22x22_stock_appointment-reminder-excl.png deleted file mode 100644 index ebbb497121..0000000000 Binary files a/data/icons/hicolor_status_22x22_stock_appointment-reminder-excl.png and /dev/null differ diff --git a/data/icons/hicolor_status_22x22_stock_appointment-reminder.png b/data/icons/hicolor_status_22x22_stock_appointment-reminder.png deleted file mode 100644 index 6c7e878d70..0000000000 Binary files a/data/icons/hicolor_status_22x22_stock_appointment-reminder.png and /dev/null differ diff --git a/data/icons/hicolor_status_24x24_stock_appointment-reminder-excl.png b/data/icons/hicolor_status_24x24_stock_appointment-reminder-excl.png deleted file mode 100644 index a4a3cb5320..0000000000 Binary files a/data/icons/hicolor_status_24x24_stock_appointment-reminder-excl.png and /dev/null differ diff --git a/data/icons/hicolor_status_24x24_stock_appointment-reminder.png b/data/icons/hicolor_status_24x24_stock_appointment-reminder.png deleted file mode 100644 index 72190aefb4..0000000000 Binary files a/data/icons/hicolor_status_24x24_stock_appointment-reminder.png and /dev/null differ diff --git a/data/icons/hicolor_status_32x32_stock_appointment-reminder-excl.png b/data/icons/hicolor_status_32x32_stock_appointment-reminder-excl.png deleted file mode 100644 index 788d7d1e95..0000000000 Binary files a/data/icons/hicolor_status_32x32_stock_appointment-reminder-excl.png and /dev/null differ diff --git a/data/icons/hicolor_status_32x32_stock_appointment-reminder.png b/data/icons/hicolor_status_32x32_stock_appointment-reminder.png deleted file mode 100644 index cdd2bb381c..0000000000 Binary files a/data/icons/hicolor_status_32x32_stock_appointment-reminder.png and /dev/null differ diff --git a/data/icons/hicolor_status_48x48_stock_appointment-reminder-excl.png b/data/icons/hicolor_status_48x48_stock_appointment-reminder-excl.png deleted file mode 100644 index f2ae551875..0000000000 Binary files a/data/icons/hicolor_status_48x48_stock_appointment-reminder-excl.png and /dev/null differ diff --git a/data/icons/hicolor_status_48x48_stock_appointment-reminder.png b/data/icons/hicolor_status_48x48_stock_appointment-reminder.png deleted file mode 100644 index 57d92a28fb..0000000000 Binary files a/data/icons/hicolor_status_48x48_stock_appointment-reminder.png and /dev/null differ -- cgit