[Xfce4-commits] <midori:master> Eliminate 'send' flag from midori_app_send_notification

[Christian Dywan]

Updating branch refs/heads/master
         to fb3fb594a9b87312abc60b48db390fac7dce8663 (commit)
       from ca2582c5e3d402db960b688f5c287efa5e6e7293 (commit)

commit fb3fb594a9b87312abc60b48db390fac7dce8663
Author: Christian Dywan <christian at twotoasts.de>
Date:   Thu Oct 14 21:14:28 2010 +0200

    Eliminate 'send' flag from midori_app_send_notification
    
    The declaration is misplaced and the logic actually makes
    no sense.

 midori/midori-app.c |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/midori/midori-app.c b/midori/midori-app.c
index 14f10ca..d3b7583 100644
--- a/midori/midori-app.c
+++ b/midori/midori-app.c
@@ -1199,21 +1199,18 @@ midori_app_send_notification (MidoriApp*   app,
     #if HAVE_HILDON
     hildon_banner_show_information_with_markup (GTK_WIDGET (app->browser),
                                                 "midori", message);
-    #else
-    gboolean sent = FALSE;
-
-    #if HAVE_LIBNOTIFY
+    #elif HAVE_LIBNOTIFY
     if (notify_is_initted ())
     {
         NotifyNotification* note;
 
         note = notify_notification_new (title, message, "midori", NULL);
-        sent = notify_notification_show (note, NULL);
+        notify_notification_show (note, NULL);
         g_object_unref (note);
     }
     #else
     /* Fall back to the command line program "notify-send" */
-    if (!sent && app->program_notify_send)
+    if (app->program_notify_send)
     {
         gchar* msgq = g_shell_quote (message);
         gchar* titleq = g_shell_quote (title);
@@ -1227,5 +1224,4 @@ midori_app_send_notification (MidoriApp*   app,
         g_free (command);
     }
     #endif
-    #endif
 }