diff -Nru dockbarx-0.90.3/debian/changelog dockbarx-0.90.3/debian/changelog --- dockbarx-0.90.3/debian/changelog 2012-10-24 17:09:20.000000000 +0000 +++ dockbarx-0.90.3/debian/changelog 2012-11-16 13:58:26.000000000 +0000 @@ -1,8 +1,14 @@ -dockbarx (0.90.3-1~ppa~natty) natty; urgency=medium +dockbarx (0.90.3-2~webupd8~natty) natty; urgency=medium + + * add 00_fix_awn_applet.patch to fix AWN applet not working with 0.90.3 + + -- Alin Andrei Fri, 16 Nov 2012 15:58:26 +0200 + +dockbarx (0.90.3-1~ppa~quantal) quantal; urgency=medium * new upstream release - -- Alin Andrei Wed, 24 Oct 2012 20:09:20 +0300 + -- Alin Andrei Wed, 24 Oct 2012 20:09:02 +0300 dockbarx (0.90.2-0~lucid~1) lucid; urgency=medium diff -Nru dockbarx-0.90.3/debian/patches/00_fix_awn_applet.patch dockbarx-0.90.3/debian/patches/00_fix_awn_applet.patch --- dockbarx-0.90.3/debian/patches/00_fix_awn_applet.patch 1970-01-01 00:00:00.000000000 +0000 +++ dockbarx-0.90.3/debian/patches/00_fix_awn_applet.patch 2012-11-16 13:42:43.000000000 +0000 @@ -0,0 +1,105 @@ +=== modified file 'AWN/DockBarX/DockBarX.py' +Index: dockbarx-0.90.3/AWN/DockBarX/DockBarX.py +=================================================================== +--- dockbarx-0.90.3.orig/AWN/DockBarX/DockBarX.py ++++ dockbarx-0.90.3/AWN/DockBarX/DockBarX.py +@@ -54,31 +54,35 @@ + gdk_screen = gtk.gdk.screen_get_default() + self.icon = self.get_icon() + self.remove(self.old_child) ++ self.alignment = gtk.Alignment() ++ self.add(self.alignment) ++ self.alignment.show() + self.db = dockbarx.dockbar.DockBar(awn_applet=self) + self.db.load() +- if self.get_pos_type() in (gtk.POS_BOTTOM, gtk.POS_TOP): +- self.box = gtk.VBox() +- self.db.set_orient("h") +- else: +- self.box = gtk.HBox() +- self.db.set_orient("v") +- if self.get_pos_type() in (gtk.POS_BOTTOM, gtk.POS_RIGHT): +- self.box.pack_end(self.db.container, False, False) +- else: +- self.box.pack_start(self.db.container, False, False) +- if self.db.orient == "h": ++ if self.get_pos_type() == gtk.POS_RIGHT: ++ self.db.set_orient("right") ++ self.alignment.set(1, 0, 0, 0) ++ elif self.get_pos_type() == gtk.POS_TOP: ++ self.db.set_orient("up") ++ self.alignment.set(0, 0, 0, 0) ++ elif self.get_pos_type() == gtk.POS_LEFT: ++ self.db.set_orient("left") ++ self.alignment.set(0, 0, 0, 0) ++ else: ++ self.db.set_orient("down") ++ self.alignment.set(0, 1, 0, 0) ++ if self.db.orient in ("down", "up"): + self.db.container.set_size_request(-1, self.get_size() + \ + self.icon.get_offset() + 5) + else: + self.db.container.set_size_request(self.get_size() + \ + self.icon.get_offset() + 5, -1) +- self.add(self.box) ++ self.alignment.add(self.db.container) + self.connect("size-changed", self.__on_size_changed) + self.connect("offset-changed", self.__on_size_changed) + self.connect("position-changed", self.__on_position_changed) + self.globals.connect("awn-behavior-changed", + self.__on_behavior_changed) +- self.box.show() + self.db.container.show() + self.show() + self.wnck_screen.connect("active-window-changed", +@@ -90,7 +94,7 @@ + self.__compute_should_autohide() + + def __on_size_changed(self, *args): +- if self.db.orient == "h": ++ if self.db.orient in ("down", "up"): + self.db.container.set_size_request(-1, self.get_size() + \ + self.icon.get_offset() + 5) + else: +@@ -99,26 +103,26 @@ + self.__compute_should_autohide() + + def __on_position_changed(self, applet, position): +- self.box.remove(self.db.container) +- self.remove(self.box) +- if self.get_pos_type() in (gtk.POS_BOTTOM, gtk.POS_TOP): +- self.box = gtk.VBox() +- self.db.set_orient("h") +- else: +- self.box = gtk.HBox() +- self.db.set_orient("v") +- if self.get_pos_type() in (gtk.POS_BOTTOM, gtk.POS_RIGHT): +- self.box.pack_end(self.db.container, False, False) +- else: +- self.box.pack_start(self.db.container, False, False) +- if self.db.orient == "h": ++ self.alignment.remove(self.db.container) ++ if self.get_pos_type() == gtk.POS_RIGHT: ++ self.db.set_orient("right") ++ self.alignment.set(1, 0, 0, 0) ++ elif self.get_pos_type() == gtk.POS_TOP: ++ self.db.set_orient("up") ++ self.alignment.set(0, 0, 0, 0) ++ elif self.get_pos_type() == gtk.POS_LEFT: ++ self.db.set_orient("left") ++ self.alignment.set(0, 0, 0, 0) ++ else: ++ self.db.set_orient("down") ++ self.alignment.set(0, 1, 0, 0) ++ if self.db.orient in ("up", "down"): + self.db.container.set_size_request(-1, self.get_size() + \ + self.icon.get_offset() + 5) + else: + self.db.container.set_size_request(self.get_size() + \ + self.icon.get_offset() + 5, -1) +- self.add(self.box) +- self.box.show() ++ self.alignment.add(self.db.container) + self.db.container.show() + self.show() + self.__compute_should_autohide() diff -Nru dockbarx-0.90.3/debian/patches/series dockbarx-0.90.3/debian/patches/series --- dockbarx-0.90.3/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ dockbarx-0.90.3/debian/patches/series 2012-11-16 13:43:00.000000000 +0000 @@ -0,0 +1 @@ +00_fix_awn_applet.patch