Merge lp:~gue5t/midori/devpet-1232865-2 into lp:midori

[gue5t gue5t]

instead of creating devpet status icon on extension load, create it only to show new messages

This is based on ivaldi's prior work: https://code.launchpad.net/~ivaldi/midori/devpet-1232865/+merge/190567

Instead of creating the status icon when the extension loads, this creates it only when a message first gets shown. It also clears messages if devpet is deactivated--because in the time between activations devpet has no idea which errors are occurring, so it shouldn't provide false context by keeping messages from a previous activation.

[Paweł Forysiuk (tuxator)]

review: Approve

[lp:~gue5t/midori/devpet-1232865-2]

6439. By gue5t <email address hidden> on 2013-11-19

merge

[André Stösel (ivaldi)]

thx

review: Approve

=== modified file 'extensions/devpet.vala'
--- extensions/devpet.vala	2013-10-28 23:25:49 +0000
+++ extensions/devpet.vala	2013-11-19 23:46:24 +0000
@@ -143,14 +143,15 @@
 
     private class Manager : Midori.Extension {
         public Gtk.ListStore list_store;
-        private Gtk.StatusIcon trayicon;
+        private Gtk.StatusIcon? trayicon = null;
         private LogWindow? log_window;
         private GLib.LogFunc default_log_func;
         private GLib.LogLevelFlags icon_flag = GLib.LogLevelFlags.LEVEL_DEBUG;
 
         public void clear_list() {
             this.icon_flag = GLib.LogLevelFlags.LEVEL_DEBUG;
-            this.trayicon.set_visible (false);
+            if(this.trayicon != null)
+                this.trayicon.set_visible (false);
             this.list_store.clear ();
         }
 
@@ -167,10 +168,21 @@
             return Gtk.Stock.DIALOG_INFO;
         }
 
+        private void ensure_trayicon() {
+            if(this.trayicon != null)
+                return;
+
+            this.trayicon = new Gtk.StatusIcon ();
+            this.trayicon.set_tooltip_text ("Midori - DevPet");
+            this.trayicon.activate.connect(this.show_error_log);
+        }
+
         private void log_handler(string? domain, GLib.LogLevelFlags flags, string message) {
             Gtk.TreeIter iter;
             unowned string stock = this.get_stock_from_log_level (flags);
 
+            this.ensure_trayicon();
+
             if (flags < this.icon_flag) {
                 this.icon_flag = flags;
                 this.trayicon.set_from_stock (stock);
@@ -215,13 +227,25 @@
         }
 
         private void activated (Midori.App app) {
-            this.trayicon.set_visible (false);
             this.default_log_func = GLib.Log.default_handler;
             GLib.Log.set_default_handler (this.log_handler);
+            if (this.trayicon != null) {
+                int length = 0;
+                this.list_store.foreach((model, path, iter) => {
+                    length++;
+                    return false;
+                });
+
+                if (length > 0) {
+                    this.trayicon.set_visible (true);
+                }
+            }
         }
 
         private void deactivated () {
-            this.trayicon.set_visible (false);
+            if (this.trayicon != null)
+                this.trayicon.set_visible (false);
+
             GLib.Log.set_default_handler (this.default_log_func);
         }
 
@@ -231,10 +255,6 @@
                          version: "0.1",
                          authors: "André Stösel <[e-mail]>");
 
-            this.trayicon = new Gtk.StatusIcon ();
-            this.trayicon.set_tooltip_text ("Midori - DevPet");
-            this.trayicon.activate.connect(this.show_error_log);
-
             this.list_store = new Gtk.ListStore (TreeCells.COUNT, typeof(string), typeof(string), typeof (string));
 
             this.activate.connect (this.activated);