Merge lp:~midori/midori/win32-tray-balloons into lp:midori

[Paweł Forysiuk]

Unmerged revisions

6912. By Paweł Forysiuk <email address hidden> on 2015-03-28

Add simple notification support using NotifyIcon

=== modified file 'midori/midori-app.c'
--- midori/midori-app.c	2015-03-23 22:07:04 +0000
+++ midori/midori-app.c	2015-04-09 18:55:09 +0000
@@ -1121,6 +1121,15 @@
  *
  * Since 0.1.7
  **/
+
+#ifdef G_OS_WIN32
+guint notify_icon_delete (NOTIFYICONDATA* nid)
+{
+    Shell_NotifyIcon (NIM_DELETE, nid);
+    return FALSE;
+}
+#endif
+
 void
 midori_app_send_notification (MidoriApp*   app,
                               const gchar* title,
@@ -1129,6 +1138,35 @@
     g_return_if_fail (MIDORI_IS_APP (app));
     g_return_if_fail (title);
 
+    #ifdef G_OS_WIN32
+    gchar* exec_dir = g_win32_get_package_installation_directory_of_module (NULL);	
+    gchar* exec_path = g_build_filename (exec_dir, "bin", "midori.exe", NULL);
+
+    NOTIFYICONDATA* nid = NULL;
+    nid = g_malloc0 (sizeof (NOTIFYICONDATA));
+    nid->cbSize = sizeof (NOTIFYICONDATA); 
+
+    nid->uFlags = NIF_INFO | NIF_ICON;
+    nid->dwInfoFlags = NIIF_USER;
+
+    guint title_len = 64;
+    guint message_len = 256;
+
+    g_strlcpy(nid->szInfoTitle, title, title_len-1);
+    g_strlcpy(nid->szInfo, message, message_len-1);
+ 
+    HICON hIcon = NULL;
+    hIcon = ExtractIcon (NULL, exec_path, 0);
+    nid->hIcon = hIcon;
+
+    Shell_NotifyIcon (NIM_ADD, nid);
+
+    g_free (exec_dir);
+    g_free (exec_path);
+
+    g_timeout_add (8000, notify_icon_delete, nid);
+    #else
+
     #ifdef HAVE_LIBNOTIFY
     if (notify_is_initted ())
     {
@@ -1149,6 +1187,7 @@
     g_application_send_notification (G_APPLICATION (app), NULL, notification);
     g_object_unref (notification);
     #endif
+    #endif
 }
 
 /**