rpms/deskbar-applet/devel deskbar-applet-2.26.0-urlopener.patch, NONE, 1.1 deskbar-applet.spec, 1.81, 1.82

[Michel Alexandre Salim]

Author: salimma

Update of /cvs/pkgs/rpms/deskbar-applet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9946

Modified Files:
	deskbar-applet.spec 
Added Files:
	deskbar-applet-2.26.0-urlopener.patch 
Log Message:
* Tue Apr 14 2009 Michel Salim <salimma at fedoraproject.org> - 2.26.0-3
- Patch for a multiple inheritance bug on 64-bit platforms


deskbar-applet-2.26.0-urlopener.patch:

--- NEW FILE deskbar-applet-2.26.0-urlopener.patch ---
### Eclipse Workspace Patch 1.0
#P deskbar-applet
Index: deskbar/handlers/twitter.py
===================================================================
--- deskbar/handlers/twitter.py	(revision 2633)
+++ deskbar/handlers/twitter.py	(working copy)
@@ -83,12 +83,10 @@
         self._update_url = update_url
         self._domain = domain
         
-        self._opener.connect ("done", self._on_opener_done)
-        
     def update (self, msg):
         try:
             post_payload = urllib.urlencode({"status" : msg, "source" : "deskbar"})
-            self._opener.open_async (self._update_url, post_payload)
+            self._opener.open_async (self._update_url, post_payload, self._on_opener_done)
         except ConcurrentRequestsException :
             LOGGER.warning ("Attempting to post while another post is already running. Ignoring")
             error = gtk.MessageDialog (None,
Index: deskbar/core/Web.py
===================================================================
--- deskbar/core/Web.py	(revision 2632)
+++ deskbar/core/Web.py	(working copy)
@@ -208,7 +208,7 @@
         Exception.__init__ (self)
 
 
-class GnomeURLopener (urllib.FancyURLopener, gobject.GObject):
+class GnomeURLopener (urllib.FancyURLopener):
     """
     A subclass of C{urllib.URLopener} able to intercept user/password requests
     and pass them through an L{Account}, displaying a L{AccountDialog} if
@@ -219,10 +219,6 @@
                      a new fresh GnomeURLopener each time you need one
     """
     
-    __gsignals__ = {
-        "done" : (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, [gobject.TYPE_PYOBJECT]),
-    }
-    
     def __init__ (self, account, extra_widget_factory=None):
         """
         @param account: The L{Account} object to request credentials from
@@ -235,7 +231,7 @@
         """
         proxies = get_proxy()
         urllib.FancyURLopener.__init__ (self, proxies)
-        gobject.GObject.__init__ (self)
+        
         self._account = account
         self._thread = None
         self._authentication_retries = 0
@@ -311,7 +307,7 @@
                         # The factory returned a non-None non-widget object
                         LOGGER.error ("%s returned a non-gtk.Widget instance: %s" % (self._extra_widget_factory, type(widget)))
     
-    def open_async (self, url, payload=None):
+    def open_async (self, url, payload=None, callback=None):
         """
         Open a URL asynchronously. When the request has been completed the
         C{"done"} signal of this class is emitted.
@@ -334,9 +330,9 @@
             raise ConcurrentRequestsException()
     
         if payload != None :
-            async_args = (url, payload)
+            async_args = ((url, payload), callback)
         else :
-            async_args = (url, )
+            async_args = ((url, ), callback)
         
         self._thread = threading.Thread (target=self._do_open_async,
                                          args=async_args,
@@ -355,9 +351,10 @@
         self._thread = None
         
         info = None
+        open_args, callback = args
         
         try:
-            info = self.open (*args)
+            info = self.open (*open_args)
         except AuthenticationAborted:
             LOGGER.debug ("Detected authentication abort")
             self._success = True # The user should not be warned
@@ -366,6 +363,7 @@
             self._success = False            
             
         gtk.gdk.threads_enter()
-        self.emit ("done", info)
+        if callback != None and callable(callback):
+            callback(self, info)
         gtk.gdk.threads_leave()



Index: deskbar-applet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/deskbar-applet/devel/deskbar-applet.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- deskbar-applet.spec	13 Apr 2009 01:35:50 -0000	1.81
+++ deskbar-applet.spec	14 Apr 2009 05:17:02 -0000	1.82
@@ -3,7 +3,7 @@
 
 Name:           deskbar-applet
 Version:        2.26.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:        A Gnome applet to allow easy access to various search engines
 Group:          Applications/Internet
@@ -14,6 +14,7 @@
 Source2:        fedorabz.png
 Patch0:         %{name}-2.26.0-gapplet.patch
 Patch1:         %{name}-2.26.0-py_sitearch.patch
+Patch2:         %{name}-2.26.0-urlopener.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gtk2-devel python-devel pygtk2-devel gnome-python2-extras
 BuildRequires:  gettext evolution-data-server-devel gnome-desktop-devel
@@ -43,6 +44,8 @@
 %patch0 -p1 -b .gapplet
 # http://bugzilla.gnome.org/show_activity.cgi?id=578803
 %patch1 -p1 -b .py_sitearch
+# http://bugzilla.gnome.org/show_bug.cgi?id=577649
+%patch2 -p0 -b .urlopener
 
 %build
 %configure --disable-schemas-install --disable-scrollkeeper
@@ -109,6 +112,9 @@
 
 
 %changelog
+* Tue Apr 14 2009 Michel Salim <salimma at fedoraproject.org> - 2.26.0-3
+- Patch for a multiple inheritance bug on 64-bit platforms
+
 * Sun Apr 12 2009 Michel Salim <salimma at fedoraproject.org> - 2.26.0-2
 - Fix site-packages location for 64-bit platforms