Merged 0.14.1

10 files changed, 12 insertions, 14 deletions

diff --git a/portato/gui/templates/AboutWindow.ui b/portato/gui/templates/AboutWindow.ui
index 893958a..79c8522 100644
--- a/portato/gui/templates/AboutWindow.ui
+++ b/portato/gui/templates/AboutWindow.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <interface>
-  <requires lib="gtk+" version="2.14"/>
+  <requires lib="gtk+" version="2.16"/>
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkAboutDialog" id="AboutWindow">
     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
diff --git a/portato/gui/templates/MailInfoWindow.ui b/portato/gui/templates/MailInfoWindow.ui
index e3cdd1f..fec34ed 100644
--- a/portato/gui/templates/MailInfoWindow.ui
+++ b/portato/gui/templates/MailInfoWindow.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <interface>
-  <requires lib="gtk+" version="2.14"/>
+  <requires lib="gtk+" version="2.16"/>
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkWindow" id="MailInfoWindow">
     <property name="title" translatable="yes">Send Bug Mail ...</property>
diff --git a/portato/gui/templates/MainWindow.ui b/portato/gui/templates/MainWindow.ui
index 2eaaae1..63cf225 100644
--- a/portato/gui/templates/MainWindow.ui
+++ b/portato/gui/templates/MainWindow.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <interface>
-  <requires lib="gtk+" version="2.14"/>
+  <requires lib="gtk+" version="2.16"/>
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkWindow" id="MainWindow">
     <property name="border_width">2</property>
diff --git a/portato/gui/templates/PkgListWindow.ui b/portato/gui/templates/PkgListWindow.ui
index fdcdb23..80ba5c7 100644
--- a/portato/gui/templates/PkgListWindow.ui
+++ b/portato/gui/templates/PkgListWindow.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <interface>
-  <requires lib="gtk+" version="2.14"/>
+  <requires lib="gtk+" version="2.16"/>
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkWindow" id="PkgListWindow">
     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
diff --git a/portato/gui/templates/PluginWindow.ui b/portato/gui/templates/PluginWindow.ui
index 42a3156..fed260c 100644
--- a/portato/gui/templates/PluginWindow.ui
+++ b/portato/gui/templates/PluginWindow.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <interface>
-  <requires lib="gtk+" version="2.14"/>
+  <requires lib="gtk+" version="2.16"/>
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkWindow" id="PluginWindow">
     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
diff --git a/portato/gui/templates/PreferenceWindow.ui b/portato/gui/templates/PreferenceWindow.ui
index 0f0a16f..1e8bf7d 100644
--- a/portato/gui/templates/PreferenceWindow.ui
+++ b/portato/gui/templates/PreferenceWindow.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <interface>
-  <requires lib="gtk+" version="2.14"/>
+  <requires lib="gtk+" version="2.16"/>
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkAdjustment" id="adjustment1">
     <property name="upper">300</property>
diff --git a/portato/gui/templates/SearchWindow.ui b/portato/gui/templates/SearchWindow.ui
index f62d259..fa17396 100644
--- a/portato/gui/templates/SearchWindow.ui
+++ b/portato/gui/templates/SearchWindow.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <interface>
-  <requires lib="gtk+" version="2.14"/>
+  <requires lib="gtk+" version="2.16"/>
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkWindow" id="SearchWindow">
     <property name="width_request">350</property>
diff --git a/portato/gui/templates/SplashScreen.ui b/portato/gui/templates/SplashScreen.ui
index c136062..2cc5152 100644
--- a/portato/gui/templates/SplashScreen.ui
+++ b/portato/gui/templates/SplashScreen.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <interface>
-  <requires lib="gtk+" version="2.14"/>
+  <requires lib="gtk+" version="2.16"/>
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkWindow" id="SplashScreen">
     <property name="width_request">300</property>
diff --git a/portato/gui/windows/main.py b/portato/gui/windows/main.py
index 261b999..164de81 100644
--- a/portato/gui/windows/main.py
+++ b/portato/gui/windows/main.py
@@ -175,7 +175,7 @@ class PackageTable:
                 ftexts.append(t)
 
         for t in ftexts:
-            link = gtk.LinkButton(t)
+            link = gtk.LinkButton(uri = t, label = t)
             link.set_alignment(0.0, 0.5)
             link.set_border_width(0)
             self.linkBox.add(link)
diff --git a/portato/gui/windows/preference.py b/portato/gui/windows/preference.py
index 772c0c7..b8c13d8 100644
--- a/portato/gui/windows/preference.py
+++ b/portato/gui/windows/preference.py
@@ -168,14 +168,12 @@ class PreferenceWindow (AbstractDialog):
         self.databaseCombo = self.tree.get_widget("databaseCombo")
         model = gtk.ListStore(str, str, str)
 
-        ctr = 0
         active = 0
-        for k, name, desc in db.types:
-            if k == dbtype:
+        for ctr, (key, t) in enumerate(db.types.iteritems()):
+            if key == dbtype:
                 active = ctr
 
-            model.append([name, desc, k])
-            ctr += 1
+            model.append([t.name, t.descr, key])
 
         self.databaseCombo.set_model(model)
         self.databaseCombo.set_active(active)