Adapt to Gtk.icon_size_lookup*() API changes

In PyGTK, icon_size_lookup*() returned just the icon size as a 2-tuple [1].
In GTK3+pygi, an additional boolean value indicating whether the passed-in
value was valid is returned. [3,4]

[1] http://developer.gnome.org/pygtk/stable/class-gtkiconsource.html#function-gtk--icon-size-lookup
[2] http://developer.gnome.org/pygtk/stable/class-gtkiconsource.html#function-gtk--icon-size-lookup-for-settings
[3] http://developer.gnome.org/gtk/stable/gtk-Themeable-Stock-Images.html#gtk-icon-size-lookup
[4] http://developer.gnome.org/gtk/stable/gtk-Themeable-Stock-Images.html#gtk-icon-size-lookup-for-settings

Signed-off-by: Simon Schampijer <simon@schampijer.de>
[marked unused local variables, fixed overlong line]
Signed-off-by: Sascha Silbe <silbe@activitycentral.com>

src/sugar3/graphics/combobox.py

@@ -62,7 +62,7 @@ class ComboBox(Gtk.ComboBox):
 
     def _get_real_name_from_theme(self, name, size):
         icon_theme = Gtk.IconTheme.get_default()
-        width, height = Gtk.icon_size_lookup(size)
+        valid_, width, height = Gtk.icon_size_lookup(size)
         info = icon_theme.lookup_icon(name, max(width, height), 0)
         if not info:
             raise ValueError('Icon %r not found.' % name)
@@ -91,8 +91,8 @@ class ComboBox(Gtk.ComboBox):
             self._icon_renderer = Gtk.CellRendererPixbuf()
 
             settings = self.get_settings()
-            w, h = Gtk.icon_size_lookup_for_settings(
-                                            settings, Gtk.IconSize.MENU)
+            valid_, w, h = Gtk.icon_size_lookup_for_settings(
+                settings, Gtk.IconSize.MENU)
             self._icon_renderer.props.stock_size = max(w, h)
 
             self.pack_start(self._icon_renderer, False)
@@ -108,7 +108,7 @@ class ComboBox(Gtk.ComboBox):
                 size = Gtk.IconSize.MENU
             else:
                 size = Gtk.IconSize.LARGE_TOOLBAR
-            width, height = Gtk.icon_size_lookup(size)
+            valid_, width, height = Gtk.icon_size_lookup(size)
 
             if icon_name:
                 file_name = self._get_real_name_from_theme(icon_name, size)

src/sugar3/graphics/icon.py

@@ -346,7 +346,7 @@ class Icon(Gtk.Image):
             self._buffer.file_name = self.props.file
 
         if self.props.pixel_size == -1:
-            width, height = Gtk.icon_size_lookup(self.props.icon_size)
+            valid_, width, height = Gtk.icon_size_lookup(self.props.icon_size)
         else:
             width = height = self.props.pixel_size
         if self._buffer.width != width or self._buffer.height != height:

src/sugar3/graphics/notebook.py

@@ -80,7 +80,8 @@ class Notebook(Gtk.Notebook):
         Gtk.Button.set_relief(button, Gtk.ReliefStyle.NONE)
 
         settings = Gtk.Widget.get_settings(button)
-        w, h = Gtk.icon_size_lookup_for_settings(settings, Gtk.IconSize.MENU)
+        valid_, w, h = Gtk.icon_size_lookup_for_settings(settings,
+                                                         Gtk.IconSize.MENU)
         Gtk.Widget.set_size_request(button, w + 4, h + 4)
         image.show()
         icon_box.pack_start(image, True, False, 0)