Imported Upstream version 0.81.2upstream/0.81.2

4 files changed, 14 insertions, 13 deletions

diff --git a/configure b/configure
index 4265f69..fcd7477 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for Sugar 0.81.1.
+# Generated by GNU Autoconf 2.61 for Sugar 0.81.2.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -572,8 +572,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='Sugar'
 PACKAGE_TARNAME='sugar'
-PACKAGE_VERSION='0.81.1'
-PACKAGE_STRING='Sugar 0.81.1'
+PACKAGE_VERSION='0.81.2'
+PACKAGE_STRING='Sugar 0.81.2'
 PACKAGE_BUGREPORT=''
 
 ac_unique_file="configure.ac"
@@ -1264,7 +1264,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Sugar 0.81.1 to adapt to many kinds of systems.
+\`configure' configures Sugar 0.81.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1330,7 +1330,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Sugar 0.81.1:";;
+     short | recursive ) echo "Configuration of Sugar 0.81.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1419,7 +1419,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Sugar configure 0.81.1
+Sugar configure 0.81.2
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1433,7 +1433,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Sugar $as_me 0.81.1, which was
+It was created by Sugar $as_me 0.81.2, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -2129,7 +2129,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='sugar'
- VERSION='0.81.1'
+ VERSION='0.81.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -6790,7 +6790,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Sugar $as_me 0.81.1, which was
+This file was extended by Sugar $as_me 0.81.2, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6837,7 +6837,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-Sugar config.status 0.81.1
+Sugar config.status 0.81.2
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/configure.ac b/configure.ac
index 1780364..3e21245 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([Sugar],[0.81.1],[],[sugar])
+AC_INIT([Sugar],[0.81.2],[],[sugar])
 
 AC_PREREQ([2.59])
 
diff --git a/src/view/devices/battery.py b/src/view/devices/battery.py
index a97d014..e4d82d3 100644
--- a/src/view/devices/battery.py
+++ b/src/view/devices/battery.py
@@ -84,6 +84,8 @@ class BatteryPalette(Palette):
             
         self._level = 0
         self._progress_bar = gtk.ProgressBar()
+        self._progress_bar.set_size_request(
+            style.zoom(style.GRID_CELL_SIZE * 4), -1)
         self._progress_bar.show()
         self._status_label = gtk.Label()
         self._status_label.show()
@@ -120,7 +122,6 @@ class BatteryPalette(Palette):
                                        'min': remaining_minpart})
         else:
             secondary_text = _('Charged')
-            status_text = ''
 
         self.props.secondary_text = secondary_text
         self._status_label.set_text(status_text)
diff --git a/src/view/frame/frameinvoker.py b/src/view/frame/frameinvoker.py
index 2c15c05..e4a13e1 100644
--- a/src/view/frame/frameinvoker.py
+++ b/src/view/frame/frameinvoker.py
@@ -30,7 +30,7 @@ def _get_screen_area():
 
 class FrameWidgetInvoker(WidgetInvoker):
     def __init__(self, widget):
-        WidgetInvoker.__init__(self, widget.child)
+        WidgetInvoker.__init__(self, widget, widget.child)
 
         self._position_hint = self.ANCHORED
         self._screen_area = _get_screen_area()