Merge branch 'hotfix-0.91.3'

M7S · Jun 20, 2014 · f7dcd91 · f7dcd91
2 parents 75a10c8 + 6a2cbea
commit f7dcd91
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,4 +1,7 @@
 Changelog:
+0.91.3
+- Fixed bug that broke DockX in 0.91.2
+
 0.91.2
 - Updated DockbarX with need changes to fix a reloading bug in the xfce plug.
 

diff --git a/README b/README
@@ -1,5 +1,5 @@
 # DockbarX
-### Version 0.91.2
+### Version 0.91.3
 
 ## About DockbarX
 DockBarX is a lightweight taskbar / panel replacement for Linux which works as a stand-alone dock (called DockX), as an an Avant Window Navigator applet, as a Xfce4 panel applet[^1], as a matepanel applet[^2] or as a legacy gnome2 panel applet. DockbarX is a fork of dockbar made by Aleksey Shaferov. DockbarX branch is developed by Matias Särs.

diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 # DockbarX
-### Version 0.91.2
+### Version 0.91.3
 
 ## About DockbarX
 DockBarX is a lightweight taskbar / panel replacement for Linux which works as a stand-alone dock (called DockX), as an an Avant Window Navigator applet, as a Xfce4 panel applet[^1], as a matepanel applet[^2] or as a legacy gnome2 panel applet. DockbarX is a fork of dockbar made by Aleksey Shaferov. DockbarX branch is developed by Matias Särs.

diff --git a/dockbarx/dockbar.py b/dockbarx/dockbar.py
@@ -37,7 +37,7 @@
 import i18n
 _ = i18n.language.gettext
 
-VERSION = "0.91.2"
+VERSION = "0.91.3"
 
 
 ATOM_WM_CLASS = gtk.gdk.atom_intern("WM_CLASS")
@@ -547,7 +547,7 @@ def load(self):
                     else:
                         self.app_ids_by_exec[exe] = id
 
-        self.reload()
+        self.reload(tell_parent=False)
 
     def reload(self, event=None, data=None, tell_parent=True):
         """Reloads DockbarX."""

diff --git a/setup.py b/setup.py
@@ -27,7 +27,7 @@
 import os
 import sys
 
-VERSION = "0.91.2"
+VERSION = "0.91.3"
 
 class build_trans(cmd.Command):
     description = "Compile .po files into .mo files"