From f3e78b4dd9113af10f9df6826db15a352a9badc4 Mon Sep 17 00:00:00 2001
From: Thomas Perl <thp@thpinfo.com>
Date: Fri, 20 Aug 2010 15:10:32 +0200
Subject: [PATCH] Maemo 5: Fix various .ui file errors

These errors would show up when gPodder is
started on the console, even though they are
not really critical, they do irritate somehow.
---
 data/ui/frmntl/gpodderdownloads.ui   | 5 -----
 data/ui/frmntl/gpodderepisodes.ui    | 5 -----
 data/ui/frmntl/gpodderpreferences.ui | 1 -
 data/ui/frmntl/gpoddershownotes.ui   | 1 -
 src/gpodder/gui.py                   | 5 ++++-
 5 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/data/ui/frmntl/gpodderdownloads.ui b/data/ui/frmntl/gpodderdownloads.ui
index d075f4d4..f4e3adc7 100644
--- a/data/ui/frmntl/gpodderdownloads.ui
+++ b/data/ui/frmntl/gpodderdownloads.ui
@@ -30,11 +30,6 @@
           </object>
         </child>
       </object>
-      <packing>
-        <property name="padding">0</property>
-        <property name="expand">True</property>
-        <property name="fill">True</property>
-      </packing>
     </child>
   </object>
   <object class="GtkAction" id="action_pause">
diff --git a/data/ui/frmntl/gpodderepisodes.ui b/data/ui/frmntl/gpodderepisodes.ui
index 336dd4d7..f37ba1fe 100644
--- a/data/ui/frmntl/gpodderepisodes.ui
+++ b/data/ui/frmntl/gpodderepisodes.ui
@@ -68,11 +68,6 @@
           </packing>
         </child>
       </object>
-      <packing>
-        <property name="padding">0</property>
-        <property name="expand">True</property>
-        <property name="fill">True</property>
-      </packing>
     </child>
   </object>
   <object class="GtkAction" id="action_shownotes">
diff --git a/data/ui/frmntl/gpodderpreferences.ui b/data/ui/frmntl/gpodderpreferences.ui
index 1fec4932..e7ddc567 100644
--- a/data/ui/frmntl/gpodderpreferences.ui
+++ b/data/ui/frmntl/gpodderpreferences.ui
@@ -77,7 +77,6 @@
                       <object class="HildonCheckButton" id="button_enable_mygpo">
                         <property name="label" translatable="yes">Synchronize with gpodder.net</property>
                         <property name="visible">True</property>
-                        <property name="arrangement">HILDON_BUTTON_ARRANGEMENT_HORIZONTAL</property>
                         <property name="size">HILDON_SIZE_FINGER_HEIGHT</property>
                         <signal name="toggled" handler="on_button_enable_mygpo_toggled"/>
                       </object>
diff --git a/data/ui/frmntl/gpoddershownotes.ui b/data/ui/frmntl/gpoddershownotes.ui
index f78bf820..74456aef 100644
--- a/data/ui/frmntl/gpoddershownotes.ui
+++ b/data/ui/frmntl/gpoddershownotes.ui
@@ -6,7 +6,6 @@
       <object class="GtkVBox" id="vbox">
         <property name="visible">True</property>
         <property name="border_width">6</property>
-        <property name="orientation">vertical</property>
         <property name="spacing">0</property>
         <child>
           <object class="HildonPannableArea" id="scrolled_window">
diff --git a/src/gpodder/gui.py b/src/gpodder/gui.py
index 116a66be..b6929d03 100644
--- a/src/gpodder/gui.py
+++ b/src/gpodder/gui.py
@@ -1097,7 +1097,10 @@ class gPodder(BuilderWidget, dbus.service.Object):
             if (model is not None and model.get_iter_first() is not None):
                 return False
 
-            role = getattr(treeview, TreeViewHelper.ROLE)
+            role = getattr(treeview, TreeViewHelper.ROLE, None)
+            if role is None:
+                return False
+
             ctx = event.window.cairo_create()
             ctx.rectangle(event.area.x, event.area.y,
                     event.area.width, event.area.height)
-- 
2.11.4.GIT