| a1f0f931 |
1 | --- ekiga-3.2.7/lib/engine/components/libnotify/libnotify-main.cpp~ 2010-05-30 23:58:01.000000000 +0200 |
| 2 | +++ ekiga-3.2.7/lib/engine/components/libnotify/libnotify-main.cpp 2011-04-07 13:22:56.466190747 +0200 |
| 3 | @@ -158,7 +158,11 @@ |
| 4 | |
| 5 | notif = notify_notification_new (notification->get_title ().c_str (), |
| 6 | notification->get_body ().c_str (), |
| 7 | - urgency, NULL); |
| 8 | + urgency |
| 9 | +#if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 && NOTIFY_VERSION_MINOR < 7) |
| 10 | + , NULL |
| 11 | +#endif |
| 12 | + ); |
| 13 | |
| 14 | g_signal_connect (notif, "closed", |
| 15 | G_CALLBACK (on_notif_closed), notification.get ()); |
| 16 | --- ekiga-3.2.7/src/gui/main.cpp~ 2010-05-30 23:58:01.000000000 +0200 |
| 578d8184 |
17 | +++ ekiga-3.2.7/src/gui/main.cpp 2011-04-07 13:33:09.966210734 +0200 |
| 18 | @@ -2820,12 +2820,18 @@ |
| a1f0f931 |
19 | |
| 20 | body = g_strdup_printf ("%s\n%s\n%s", uri, app, account); |
| 21 | |
| 22 | - notify = notify_notification_new (title, body, GM_ICON_LOGO, NULL); |
| 23 | + notify = notify_notification_new (title, body, GM_ICON_LOGO |
| 24 | +#if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 && NOTIFY_VERSION_MINOR < 7) |
| 25 | + , NULL |
| 26 | +#endif |
| 27 | + ); |
| 28 | notify_notification_add_action (notify, "accept", _("Accept"), notify_action_cb, mw, NULL); |
| 29 | notify_notification_add_action (notify, "reject", _("Reject"), notify_action_cb, mw, NULL); |
| 30 | notify_notification_set_timeout (notify, NOTIFY_EXPIRES_NEVER); |
| 578d8184 |
31 | notify_notification_set_urgency (notify, NOTIFY_URGENCY_CRITICAL); |
| 32 | +#if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 && NOTIFY_VERSION_MINOR < 7) |
| 33 | notify_notification_attach_to_status_icon (notify, statusicon); |
| 34 | +#endif |
| 35 | if (!notify_notification_show (notify, NULL)) { |
| 36 | ekiga_main_window_incoming_call_dialog_show (mw, call); |
| 37 | } |
projects / packages / ekiga.git / blame