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

[Cris Dywan]

Use stock as string in liststore

I was seeing errors about gtk-dialog not being found - these are stock items and shouldn't be passed to API that expects icon names.

[André Stösel (ivaldi)]

review: Approve

=== modified file 'extensions/devpet.vala'
--- extensions/devpet.vala	2013-08-03 21:03:31 +0000
+++ extensions/devpet.vala	2013-09-17 22:16:40 +0000
@@ -118,7 +118,7 @@
 
             treeview.insert_column_with_attributes (
                 -1, "Type",
-                new Gtk.CellRendererPixbuf (), "pixbuf", TreeCells.STOCK);
+                new Gtk.CellRendererPixbuf (), "stock-id", TreeCells.STOCK);
             treeview.insert_column_with_attributes (
                 -1, "Message",
                 new Gtk.CellRendererText (), "text", TreeCells.MESSAGE);
@@ -194,7 +194,7 @@
                 #if !HAVE_WIN32
                 TreeCells.BACKTRACE, bt,
                 #endif
-                TreeCells.STOCK, theme.load_icon (stock, 16, 0));
+                TreeCells.STOCK, stock);
 
             this.trayicon.set_visible (true);
         }
@@ -233,7 +233,7 @@
             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 (Gdk.Pixbuf));
+            this.list_store = new Gtk.ListStore (TreeCells.COUNT, typeof(string), typeof(string), typeof (string));
 
             this.activate.connect (this.activated);
             this.deactivate.connect (this.deactivated);