[Pkg-utopia-commits] r3578 - in /packages/unstable/d-feet/debian: changelog patches/10_tree_model_crash.patch patches/11_selection_crash.patch patches/20_menubar_gap.patch patches/series
bigon at users.alioth.debian.org
bigon at users.alioth.debian.org
Tue Apr 20 21:50:15 UTC 2010
Author: bigon
Date: Tue Apr 20 21:50:15 2010
New Revision: 3578
URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=3578
Log:
* Thanks to Robert Ancell <robert.ancell at canonical.com>
for these patches
* debian/patches/10_tree_model_crash.patch:
- Fix crash in tree model API usage (Closes: #539759)
* debian/patches/11_selection_crash.patch:
- Fix crash deselecting tree view
* debian/patches/20_menubar_gap.patch:
- Fix spacing around the menubar
Added:
packages/unstable/d-feet/debian/patches/10_tree_model_crash.patch
packages/unstable/d-feet/debian/patches/11_selection_crash.patch
packages/unstable/d-feet/debian/patches/20_menubar_gap.patch
packages/unstable/d-feet/debian/patches/series
Modified:
packages/unstable/d-feet/debian/changelog
Modified: packages/unstable/d-feet/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/d-feet/debian/changelog?rev=3578&op=diff
==============================================================================
--- packages/unstable/d-feet/debian/changelog (original)
+++ packages/unstable/d-feet/debian/changelog Tue Apr 20 21:50:15 2010
@@ -1,3 +1,16 @@
+d-feet (0.1.10-3) UNRELEASED; urgency=low
+
+ * Thanks to Robert Ancell <robert.ancell at canonical.com>
+ for these patches
+ * debian/patches/10_tree_model_crash.patch:
+ - Fix crash in tree model API usage (Closes: #539759)
+ * debian/patches/11_selection_crash.patch:
+ - Fix crash deselecting tree view
+ * debian/patches/20_menubar_gap.patch:
+ - Fix spacing around the menubar
+
+ -- Laurent Bigonville <bigon at debian.org> Tue, 20 Apr 2010 23:44:17 +0200
+
d-feet (0.1.10-2) unstable; urgency=low
* Bump Standards-Version (no further change)
Added: packages/unstable/d-feet/debian/patches/10_tree_model_crash.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/d-feet/debian/patches/10_tree_model_crash.patch?rev=3578&op=file
==============================================================================
--- packages/unstable/d-feet/debian/patches/10_tree_model_crash.patch (added)
+++ packages/unstable/d-feet/debian/patches/10_tree_model_crash.patch Tue Apr 20 21:50:15 2010
@@ -1,0 +1,16 @@
+## Description: add some description
+## Origin/Author: add some origin or author
+## Bug: bug URL
+Index: d-feet-0.1.10/dfeet/introspect_data.py
+===================================================================
+--- d-feet-0.1.10.orig/dfeet/introspect_data.py 2010-04-19 13:59:03.454051568 +1000
++++ d-feet-0.1.10/dfeet/introspect_data.py 2010-04-19 13:58:57.724039241 +1000
+@@ -51,6 +51,8 @@
+ return self.child_list.index(child)
+
+ def on_get_iter(self, path):
++ if path[0] >= len(self.child_list):
++ return None
+ op = self.child_list[path[0]]
+ if len(path) == 1:
+ return op
Added: packages/unstable/d-feet/debian/patches/11_selection_crash.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/d-feet/debian/patches/11_selection_crash.patch?rev=3578&op=file
==============================================================================
--- packages/unstable/d-feet/debian/patches/11_selection_crash.patch (added)
+++ packages/unstable/d-feet/debian/patches/11_selection_crash.patch Tue Apr 20 21:50:15 2010
@@ -1,0 +1,20 @@
+## Description: add some description
+## Origin/Author: add some origin or author
+## Bug: bug URL
+Index: d-feet-0.1.10/dfeet/_ui/busnameinfobox.py
+===================================================================
+--- d-feet-0.1.10.orig/dfeet/_ui/busnameinfobox.py 2010-04-19 14:23:28.906535894 +1000
++++ d-feet-0.1.10/dfeet/_ui/busnameinfobox.py 2010-04-19 14:23:23.906620054 +1000
+@@ -95,9 +95,9 @@
+
+ def cursor_changed_handler(self, treeview):
+ node = self.get_selected_node()
+- node.on_selected(self.busname)
+-
+- self.emit('selected', node)
++ if node:
++ node.on_selected(self.busname)
++ self.emit('selected', node)
+
+ def get_selected_node(self):
+ selection = self.introspect_tree_view.get_selection()
Added: packages/unstable/d-feet/debian/patches/20_menubar_gap.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/d-feet/debian/patches/20_menubar_gap.patch?rev=3578&op=file
==============================================================================
--- packages/unstable/d-feet/debian/patches/20_menubar_gap.patch (added)
+++ packages/unstable/d-feet/debian/patches/20_menubar_gap.patch Tue Apr 20 21:50:15 2010
@@ -1,0 +1,83 @@
+From 15efcb72560bb0decffaf7c5bc58897ee084dad8 Mon Sep 17 00:00:00 2001
+From: Chris Couzens <ccouzens at gmail.com>
+Date: Wed, 14 Apr 2010 21:39:01 +0100
+Subject: [PATCH] removed gap between window titlebar and menubar
+
+This makes the window titlebar and menubar appear merged in themes
+such as the one Ubuntu 10.04 uses.
+---
+ ui/mainwindow.ui | 40 ++++++++++++++++++++--------------------
+ 1 files changed, 20 insertions(+), 20 deletions(-)
+
+diff --git a/ui/mainwindow.ui b/ui/mainwindow.ui
+index 2cbf850..cd3ae66 100644
+--- a/ui/mainwindow.ui
++++ b/ui/mainwindow.ui
+@@ -9,29 +9,29 @@
+ <property name="visible">True</property>
+ <property name="width_request">300</property>
+ <child>
++ <object class="GtkVBox" id="vbox1">
++ <property name="visible">True</property>
++ <child>
++ <object class="GtkMenuBar" id="menubar1" constructor="default-uiman" />
++ <packing>
++ <property name="expand">False</property>
++ </packing>
++ </child>
++ <child>
++ <object constructor="default-uiman" class="GtkToolbar" id="toolbar1">
++ <property name="toolbar_style">both-horiz</property>
++ <property name="visible">True</property>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ </packing>
++ </child>
++ <child>
+ <object class="GtkVPaned" id="vpaned1">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkFrame" id="frame1">
+ <property name="visible">True</property>
+- <child>
+- <object class="GtkVBox" id="vbox1">
+- <property name="visible">True</property>
+- <child>
+- <object class="GtkMenuBar" id="menubar1" constructor="default-uiman" />
+- <packing>
+- <property name="expand">False</property>
+- </packing>
+- </child>
+- <child>
+- <object constructor="default-uiman" class="GtkToolbar" id="toolbar1">
+- <property name="toolbar_style">both-horiz</property>
+- <property name="visible">True</property>
+- </object>
+- <packing>
+- <property name="expand">False</property>
+- </packing>
+- </child>
+ <child>
+ <object class="GtkNotebook" id="display_notebook">
+ <property name="enable_popup">True</property>
+@@ -43,8 +43,6 @@
+ </child>
+ </object>
+ </child>
+- </object>
+- </child>
+ </object>
+ <packing>
+ <property name="shrink">False</property>
+@@ -82,5 +80,7 @@
+ </child>
+ </object>
+ </child>
++ </object>
++ </child>
+ </object>
+ </interface>
+--
+1.7.0.4
+
Added: packages/unstable/d-feet/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/d-feet/debian/patches/series?rev=3578&op=file
==============================================================================
--- packages/unstable/d-feet/debian/patches/series (added)
+++ packages/unstable/d-feet/debian/patches/series Tue Apr 20 21:50:15 2010
@@ -1,0 +1,3 @@
+10_tree_model_crash.patch
+20_menubar_gap.patch
+11_selection_crash.patch
More information about the Pkg-utopia-commits
mailing list