--- ffgtk-0.7.93/ffgtk/monitor.c	2011-03-26 22:25:08.000000000 +0100
+++ ffgtk-0.7.93-compiled/ffgtk/monitor.c	2011-03-30 18:05:40.000000000 +0200
@@ -359,21 +359,33 @@
 	}
 
 	if ( psPerson != NULL && psPerson -> psImage != NULL ) {
+#if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 && NOTIFY_VERSION_MINOR < 7)
 		psTooltip = notify_notification_new( nType == CALL_TYPE_INCOMING ? _( "Incoming call" ) : _( "Outgoing call" ), pnText, NULL, NULL );
+#else
+		psTooltip = notify_notification_new( nType == CALL_TYPE_INCOMING ? _( "Incoming call" ) : _( "Outgoing call" ), pnText, NULL);
+#endif
 		notify_notification_set_icon_from_pixbuf( psTooltip, psPerson -> psImage );
 	} else {
+#if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 && NOTIFY_VERSION_MINOR < 7)
 		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 );
+#else
+		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" );
+#endif
 	}
 
 	notify_notification_set_category( psTooltip, "information" );
 	notify_notification_set_timeout( psTooltip, callMonitorGetDisplayTime( getActiveProfile() ) * 1000 );
 	notify_notification_set_urgency( psTooltip, NOTIFY_URGENCY_NORMAL );
+#if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 && NOTIFY_VERSION_MINOR < 7)
 	notify_notification_attach_to_status_icon( psTooltip, getTrayIcon() );
+#endif
 
 #ifndef HAVE_APPINDICATOR
 	gtk_status_icon_get_geometry( getTrayIcon(), &psScreen, &sArea, NULL );
+#if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 && NOTIFY_VERSION_MINOR < 7)
 	notify_notification_set_geometry_hints( psTooltip, psScreen, sArea.x, sArea.y );
 #endif
+#endif
 	notify_notification_show( psTooltip, NULL );
 
 	g_free( pnText );