# HG changeset patch
# User Mikel Olasagasti Uranga <mikel@olasagasti.info>
# Date 1277763345 -7200
# Node ID 75a53bdb5d20b98ff42457a772bc924b60d1a298
# Parent  cf608f40f65bdf08978decb0c52ed075609a2e8d
# Parent  8a2b7cfa374a178b4ef550a18d6718de009fd8e7
Automated merge with https://bitbucket.org/urmas/revelation

diff -r cf608f40f65bdf08978decb0c52ed075609a2e8d -r 75a53bdb5d20b98ff42457a772bc924b60d1a298 autogen.sh
--- a/autogen.sh	Thu Jun 17 10:17:36 2010 +0700
+++ b/autogen.sh	Tue Jun 29 00:15:45 2010 +0200
@@ -19,17 +19,17 @@
 
 # generates makefiles etc
 echo "Running $ACLOCAL..."
-WANT_AUTOMAKE="1.7" $ACLOCAL || exit 1
+WANT_AUTOMAKE="1.9" $ACLOCAL || exit 1
 test -f aclocal.m4 || \
 	{ echo "aclocal failed to generate aclocal.m4" 2>&1; exit 1; }
 
 echo "Running $AUTOCONF..."
-WANT_AUTOMAKE="1.7" $AUTOCONF || exit 1
+WANT_AUTOMAKE="1.9" $AUTOCONF || exit 1
 test -f configure || \
 	{ echo "autoconf failed to generate configure" 2>&1; exit 1; }
 
 echo "Running $AUTOMAKE..."
-WANT_AUTOMAKE="1.7" $AUTOMAKE || exit 1
+WANT_AUTOMAKE="1.9" $AUTOMAKE || exit 1
 test -f Makefile.in || \
 	{ echo "automake failed to generate Makefile.in" 2>&1; exit 1; }
 
diff -r cf608f40f65bdf08978decb0c52ed075609a2e8d -r 75a53bdb5d20b98ff42457a772bc924b60d1a298 configure.ac
--- a/configure.ac	Thu Jun 17 10:17:36 2010 +0700
+++ b/configure.ac	Tue Jun 29 00:15:45 2010 +0200
@@ -7,7 +7,7 @@
 dnl initialize autoconf/automake
 AC_PREREQ(2.53)
 AC_INIT(src/revelation.in)
-AM_INIT_AUTOMAKE(revelation, 0.4.11)
+AM_INIT_AUTOMAKE(revelation, 0.4.12)
 ALL_LINGUAS="cs de fr fi ru sv zh"
 
 dnl check for dependencies
diff -r cf608f40f65bdf08978decb0c52ed075609a2e8d -r 75a53bdb5d20b98ff42457a772bc924b60d1a298 data/gconf/revelation.schemas
--- a/data/gconf/revelation.schemas	Thu Jun 17 10:17:36 2010 +0700
+++ b/data/gconf/revelation.schemas	Tue Jun 29 00:15:45 2010 +0200
@@ -321,7 +321,7 @@
 			<applyto>/apps/revelation/view/passwords</applyto>
 			<owner>revelation</owner>
 			<type>bool</type>
-			<default>true</default>
+			<default>false</default>
 
 			<locale name="C">
 				<short>Show passwords</short>
diff -r cf608f40f65bdf08978decb0c52ed075609a2e8d -r 75a53bdb5d20b98ff42457a772bc924b60d1a298 po/fr.po
--- a/po/fr.po	Thu Jun 17 10:17:36 2010 +0700
+++ b/po/fr.po	Tue Jun 29 00:15:45 2010 +0200
@@ -10,7 +10,7 @@
 "Project-Id-Version: REVELATION SVN#560\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-08-31 04:56+0200\n"
-"PO-Revision-Date: 2006-09-09 04:24+0200\n"
+"PO-Revision-Date: 2008-04-03 13:55+0200\n"
 "Last-Translator: Gilles ACCAD <dagg@d-bog.com>\n"
 "Language-Team: French\n"
 "MIME-Version: 1.0\n"
@@ -1353,7 +1353,7 @@
 msgid ""
 "The password you entered is not secure; %s. Are you sure you want to use it?"
 msgstr ""
-"Le mot de passe que vous avez saisi est faible."
+"Le mot de passe que vous avez saisi est faible; %s."
 "Êtes-vous sûr de vouloir quand même l'utiliser ?"
 
 #: src/lib/dialog.py:739
diff -r cf608f40f65bdf08978decb0c52ed075609a2e8d -r 75a53bdb5d20b98ff42457a772bc924b60d1a298 src/lib/dialog.py
--- a/src/lib/dialog.py	Thu Jun 17 10:17:36 2010 +0700
+++ b/src/lib/dialog.py	Tue Jun 29 00:15:45 2010 +0200
@@ -1230,7 +1230,7 @@
 		self.spin_pwlen = ui.SpinEntry()
 		self.spin_pwlen.set_range(4, 256)
 		self.spin_pwlen.set_value(self.config.get("passwordgen/length"))
-		self.tooltips.set_tip(self.spin_pwlen, ('The number of characters in generated passwords - 8 or more are recommended'))
+		self.tooltips.set_tip(self.spin_pwlen, _('The number of characters in generated passwords - 8 or more are recommended'))
 		self.section.append_widget(_('Length'), self.spin_pwlen)
 
 		self.connect("response", self.__cb_response)
diff -r cf608f40f65bdf08978decb0c52ed075609a2e8d -r 75a53bdb5d20b98ff42457a772bc924b60d1a298 src/lib/ui.py
--- a/src/lib/ui.py	Thu Jun 17 10:17:36 2010 +0700
+++ b/src/lib/ui.py	Tue Jun 29 00:15:45 2010 +0200
@@ -1258,7 +1258,7 @@
 		gtk.ImageMenuItem.__init__(self, stock)
 
 		self.label = self.get_children()[0]
-		self.image = self.get_children()[1]
+		self.image = self.get_image()
 
 		if text is not None:
 			self.set_text(text)
diff -r cf608f40f65bdf08978decb0c52ed075609a2e8d -r 75a53bdb5d20b98ff42457a772bc924b60d1a298 src/revelation-applet.in
--- a/src/revelation-applet.in	Thu Jun 17 10:17:36 2010 +0700
+++ b/src/revelation-applet.in	Tue Jun 29 00:15:45 2010 +0200
@@ -186,6 +186,9 @@
 
 		self.hbox = ui.HBox(self.eventbox, self.entry)
 		self.applet.add(self.hbox)
+		
+		# handle Gnome Panel background
+		self.applet.connect("change-background",self.panel_bg)
 
 		self.applet.show_all()
 
@@ -322,6 +325,29 @@
 		else:
 			self.entry_show(data)
 
+    # Handle Gnome Panel background
+	def panel_bg(self, applet, bg_type, color, pixmap):
+		# Reset styles
+		rc_style = gtk.RcStyle()
+		self.applet.set_style(None)
+		self.eventbox.set_style(None)
+		self.entry.set_style(None)
+		
+		self.applet.modify_style(rc_style)
+		self.eventbox.modify_style(rc_style)
+		self.entry.modify_style(rc_style)
+		
+		if bg_type == gnomeapplet.PIXMAP_BACKGROUND:
+			style = self.applet.get_style()
+			style.bg_pixmap[gtk.STATE_NORMAL] = pixmap
+			self.applet.set_style(style)
+			self.eventbox.set_style(style)
+			self.entry.set_style(style)
+		if bg_type == gnomeapplet.COLOR_BACKGROUND:
+			self.applet.modify_bg(gtk.STATE_NORMAL, color)
+			self.eventbox.modify_bg(gtk.STATE_NORMAL, color)
+			self.entry.modify_bg(gtk.STATE_NORMAL, color)
+
 
 
 	##### PRIVATE METHODS #####