|
Lines 359-379
Link Here
|
| 359 |
} |
359 |
} |
| 360 |
|
360 |
|
| 361 |
if ( psPerson != NULL && psPerson -> psImage != NULL ) { |
361 |
if ( psPerson != NULL && psPerson -> psImage != NULL ) { |
|
|
362 |
#if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 && NOTIFY_VERSION_MINOR < 7) |
| 362 |
psTooltip = notify_notification_new( nType == CALL_TYPE_INCOMING ? _( "Incoming call" ) : _( "Outgoing call" ), pnText, NULL, NULL ); |
363 |
psTooltip = notify_notification_new( nType == CALL_TYPE_INCOMING ? _( "Incoming call" ) : _( "Outgoing call" ), pnText, NULL, NULL ); |
|
|
364 |
#else |
| 365 |
psTooltip = notify_notification_new( nType == CALL_TYPE_INCOMING ? _( "Incoming call" ) : _( "Outgoing call" ), pnText, NULL); |
| 366 |
#endif |
| 363 |
notify_notification_set_icon_from_pixbuf( psTooltip, psPerson -> psImage ); |
367 |
notify_notification_set_icon_from_pixbuf( psTooltip, psPerson -> psImage ); |
| 364 |
} else { |
368 |
} else { |
|
|
369 |
#if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 && NOTIFY_VERSION_MINOR < 7) |
| 365 |
psTooltip = notify_notification_new( nType == CALL_TYPE_INCOMING ? _( "Incoming call" ) : _( "Outgoing call" ), pnText, nType == CALL_TYPE_INCOMING ? SHAREDIR "notification-message-ffgtk-in.svg" : SHAREDIR "notification-message-ffgtk-out.svg", NULL ); |
370 |
psTooltip = notify_notification_new( nType == CALL_TYPE_INCOMING ? _( "Incoming call" ) : _( "Outgoing call" ), pnText, nType == CALL_TYPE_INCOMING ? SHAREDIR "notification-message-ffgtk-in.svg" : SHAREDIR "notification-message-ffgtk-out.svg", NULL ); |
|
|
371 |
#else |
| 372 |
psTooltip = notify_notification_new( nType == CALL_TYPE_INCOMING ? _( "Incoming call" ) : _( "Outgoing call" ), pnText, nType == CALL_TYPE_INCOMING ? SHAREDIR "notification-message-ffgtk-in.svg" : SHAREDIR "notification-message-ffgtk-out.svg" ); |
| 373 |
#endif |
| 366 |
} |
374 |
} |
| 367 |
|
375 |
|
| 368 |
notify_notification_set_category( psTooltip, "information" ); |
376 |
notify_notification_set_category( psTooltip, "information" ); |
| 369 |
notify_notification_set_timeout( psTooltip, callMonitorGetDisplayTime( getActiveProfile() ) * 1000 ); |
377 |
notify_notification_set_timeout( psTooltip, callMonitorGetDisplayTime( getActiveProfile() ) * 1000 ); |
| 370 |
notify_notification_set_urgency( psTooltip, NOTIFY_URGENCY_NORMAL ); |
378 |
notify_notification_set_urgency( psTooltip, NOTIFY_URGENCY_NORMAL ); |
|
|
379 |
#if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 && NOTIFY_VERSION_MINOR < 7) |
| 371 |
notify_notification_attach_to_status_icon( psTooltip, getTrayIcon() ); |
380 |
notify_notification_attach_to_status_icon( psTooltip, getTrayIcon() ); |
|
|
381 |
#endif |
| 372 |
|
382 |
|
| 373 |
#ifndef HAVE_APPINDICATOR |
383 |
#ifndef HAVE_APPINDICATOR |
| 374 |
gtk_status_icon_get_geometry( getTrayIcon(), &psScreen, &sArea, NULL ); |
384 |
gtk_status_icon_get_geometry( getTrayIcon(), &psScreen, &sArea, NULL ); |
|
|
385 |
#if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 && NOTIFY_VERSION_MINOR < 7) |
| 375 |
notify_notification_set_geometry_hints( psTooltip, psScreen, sArea.x, sArea.y ); |
386 |
notify_notification_set_geometry_hints( psTooltip, psScreen, sArea.x, sArea.y ); |
| 376 |
#endif |
387 |
#endif |
|
|
388 |
#endif |
| 377 |
notify_notification_show( psTooltip, NULL ); |
389 |
notify_notification_show( psTooltip, NULL ); |
| 378 |
|
390 |
|
| 379 |
g_free( pnText ); |
391 |
g_free( pnText ); |
