[gwibber/f13/master] 2.31.4
Tom Callaway
spot at fedoraproject.org
Mon Aug 9 20:07:52 UTC 2010
commit 5c089906a00f92bea542c1165a064b028f340608
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date: Mon Aug 9 16:08:16 2010 -0400
2.31.4
gwibber-794bzr-cleanup-fbauth.patch | 43 +++++++++++++++++++++++++++++
gwibber-794bzr-no-Position-printing.patch | 12 ++++++++
gwibber-794bzr-quit-when-minimized.patch | 19 +++++++++++++
gwibber.spec | 24 +++++++++++-----
sources | 2 +-
5 files changed, 92 insertions(+), 8 deletions(-)
---
diff --git a/gwibber-794bzr-cleanup-fbauth.patch b/gwibber-794bzr-cleanup-fbauth.patch
new file mode 100644
index 0000000..6ffca12
--- /dev/null
+++ b/gwibber-794bzr-cleanup-fbauth.patch
@@ -0,0 +1,43 @@
+diff -up gwibber-794bzr/gwibber/accounts.py.fbauth gwibber-794bzr/gwibber/accounts.py
+diff -up gwibber-794bzr/gwibber/lib/gtk/facebook.py.fbauth gwibber-794bzr/gwibber/lib/gtk/facebook.py
+--- gwibber-794bzr/gwibber/lib/gtk/facebook.py.fbauth 2010-08-09 13:40:15.000000000 -0400
++++ gwibber-794bzr/gwibber/lib/gtk/facebook.py 2010-08-09 13:42:05.273483002 -0400
+@@ -69,7 +69,9 @@ class AccountWidget(gtk.VBox):
+ self.ui.get_object("hbox_facebook_auth_done").show()
+ else:
+ self.ui.get_object("hbox_facebook_auth_done").hide()
+- self.ui.get_object("facebook_auth_button").modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse("red"))
++ self.ui.get_object("facebook_auth_button").modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse("green"))
++ self.ui.get_object("facebook_auth_button").set_label(_("Authorized."))
++ self.ui.get_object("fb_auth_done_label").set_label(_("Click above to reauthorize."))
+ if self.dialog:
+ self.dialog.get_object('vbox_create').hide()
+ except:
+diff -up gwibber-794bzr/ui/gwibber-accounts-facebook.ui.fbauth gwibber-794bzr/ui/gwibber-accounts-facebook.ui
+--- gwibber-794bzr/ui/gwibber-accounts-facebook.ui.fbauth 2010-08-09 13:40:15.000000000 -0400
++++ gwibber-794bzr/ui/gwibber-accounts-facebook.ui 2010-08-09 13:42:05.276483002 -0400
+@@ -26,15 +26,6 @@
+ <property name="position">0</property>
+ </packing>
+ </child>
+- <child>
+- <object class="GtkLabel" id="fb_auth_label">
+- <property name="visible">True</property>
+- <property name="label" translatable="yes">Authorize with facebook</property>
+- </object>
+- <packing>
+- <property name="position">1</property>
+- </packing>
+- </child>
+ </object>
+ <packing>
+ <property name="position">0</property>
+@@ -46,7 +37,7 @@
+ <child>
+ <object class="GtkLabel" id="fb_auth_done_label">
+ <property name="visible">True</property>
+- <property name="label" translatable="yes">Facebook authorized</property>
++ <property name="label" translatable="yes">Facebook NOT YET authorized</property>
+ </object>
+ <packing>
+ <property name="position">0</property>
diff --git a/gwibber-794bzr-no-Position-printing.patch b/gwibber-794bzr-no-Position-printing.patch
new file mode 100644
index 0000000..71d128d
--- /dev/null
+++ b/gwibber-794bzr-no-Position-printing.patch
@@ -0,0 +1,12 @@
+diff -up gwibber-794bzr/gwibber/gwui.py.no-position-printing gwibber-794bzr/gwibber/gwui.py
+--- gwibber-794bzr/gwibber/gwui.py.no-position-printing 2010-08-09 13:40:15.000000000 -0400
++++ gwibber-794bzr/gwibber/gwui.py 2010-08-09 13:44:42.134483002 -0400
+@@ -681,7 +681,7 @@ class MessageStream(gtk.HBox):
+ self.handle_scroll(int(self.scrollbar.get_value()))
+
+ def handle_scroll(self, value):
+- print "Position:", value
++ # print "Position:", value
+ self.message_view.execute_script("""
+ document.location.hash = "";
+ document.location.hash = "msg-%s"
diff --git a/gwibber-794bzr-quit-when-minimized.patch b/gwibber-794bzr-quit-when-minimized.patch
new file mode 100644
index 0000000..e8d91da
--- /dev/null
+++ b/gwibber-794bzr-quit-when-minimized.patch
@@ -0,0 +1,19 @@
+diff -up gwibber-794bzr/gwibber/client.py.BAD gwibber-794bzr/gwibber/client.py
+--- gwibber-794bzr/gwibber/client.py.BAD 2010-08-09 13:56:51.444483001 -0400
++++ gwibber-794bzr/gwibber/client.py 2010-08-09 13:58:14.654483002 -0400
+@@ -368,8 +368,13 @@ class GwibberClient(gtk.Window):
+
+ def on_window_close(self, *args):
+ if self.model.settings["minimize_to_tray"]:
+- self.on_toggle_window_visibility(self)
+- return True
++ if self.get_property("visible"):
++ self.on_toggle_window_visibility(self)
++ return True
++ else:
++ self.save_window_settings()
++ log.logger.info("Gwibber Client closed")
++ gtk.main_quit()
+ else:
+ self.save_window_settings()
+ log.logger.info("Gwibber Client closed")
diff --git a/gwibber.spec b/gwibber.spec
index 4f67d7f..8a1fd8e 100644
--- a/gwibber.spec
+++ b/gwibber.spec
@@ -1,10 +1,10 @@
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%global basever 2.31.2
+%global basever 2.31.4
Name: gwibber
Version: %{basever}
-Release: 7%{?dist}
+Release: 1%{?dist}
Epoch: 1
Summary: An open source microblogging client for GNOME developed with Python and GTK
Group: Applications/Internet
@@ -14,13 +14,12 @@ URL: https://launchpad.net/gwibber
# The source for this package can be pulled from upstream's vcs. Use the
# following command to generate the tarball:
# bzr export -r %{bzr_rev} gwibber-%{bzr_rev}bzr.tar.gz lp:gwibber
-# bzr export -r 738 gwibber-pre3-738bzr.tar.gz lp:~segphault/gwibber/pre-3-merge
# Source0: http://launchpad.net/gwibber/trunk/%{basever}/+download/gwibber-%{version}.tar.gz
-Source0: gwibber-pre3-738bzr.tar.gz
+Source0: gwibber-794bzr.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# Cleanup facebook auth dialog
-Patch0: gwibber-pre3-cleanup-fbauth.patch
+Patch0: gwibber-794bzr-cleanup-fbauth.patch
# Gwibber unicode hack
# See: https://bugs.launchpad.net/gwibber/+bug/532952
@@ -31,7 +30,10 @@ Patch1: gwibber-sqlite-725bzr-twitter-unicode-hack.patch
Patch2: gwibber-pre3-no-libproxy.patch
# Turn off Position printing debug. Noise noise noise!
-Patch3: gwibber-pre3-no-Position-printing.patch
+Patch3: gwibber-794bzr-no-Position-printing.patch
+
+# Quit when minimized to icon and I tell the icon to quit.
+Patch4: gwibber-794bzr-quit-when-minimized.patch
Requires: libsoup, python-pycurl, PyXML
Requires: python
@@ -59,11 +61,12 @@ and GTK. It supports Twitter, Jaiku, Identi.ca, Facebook, and Digg.
%prep
-%setup -q -n gwibber-pre3-738bzr
+%setup -q -n gwibber-794bzr
%patch0 -p1 -b .fbauth
%patch1 -p1 -b .gwibber-unicode-hack
%patch2 -p1 -b .no-libproxy
%patch3 -p1 -b .no-position-printing
+%patch4 -p1 -b .quit
sed -i -e '/^#! \?\//, 1d' $(find %{name} | grep "\.py$")
@@ -107,6 +110,13 @@ rm -rf %{buildroot}
%{_datadir}/indicators/messages/applications/gwibber
%changelog
+* Mon Aug 9 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 1:2.31.4-1
+- update to 2.31.4
+- fix issue where client minimized to icon will not quit when told to
+
+* Wed Jul 28 2010 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1:2.31.2-8
+- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
+
* Mon Jul 26 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 1:2.31.2-7
- update to 738, which has most of my patches merged!
diff --git a/sources b/sources
index b6d6c70..b11ddb9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e6ab30fb28971aad4ab0a4504d5567e0 gwibber-pre3-738bzr.tar.gz
+a1587d8456bfe4601f09c5ee493fe8ff gwibber-794bzr.tar.gz
More information about the scm-commits
mailing list