Merge lp:~kalikiana/midori/growl into lp:midori

[Cris Dywan]

Fallback to infobar in current tab instead of notification

[André Stösel (ivaldi)]

There is currently no way to close the notification.

review: Needs Fixing

[Cris Dywan (kalikiana)]

I think there's sort of a silent agreement that this isn't a convincing alternative for notifications. It may just be better to actually have a simple popup window implemented by Midori.

review: Disapprove

Unmerged revisions

6192. By Cris Dywan on 2013-06-03

Fallback to infobar in current tab instead of notification

=== modified file 'midori/midori-app.c'
--- midori/midori-app.c	2013-05-30 11:08:14 +0000
+++ midori/midori-app.c	2013-06-03 22:08:24 +0000
@@ -1304,6 +1304,12 @@
         notify_notification_show (note, NULL);
         g_object_unref (note);
     }
+    #else
+    g_return_if_fail (app->browser != NULL);
+    GtkWidget* view = midori_browser_get_current_tab (app->browser);
+    gchar* formatted = g_strconcat (title, " ", message, NULL);
+    midori_view_add_info_bar (MIDORI_VIEW (view), GTK_MESSAGE_INFO, formatted, NULL, NULL, NULL);
+    g_free (formatted);
     #endif
 }