← Back to branch summary

~matttbe/wicd/ubuntu_python27

« back to all changes in this revision

Viewing changes to debian/patches/22-fix_deprecation.patch

  • Committer: Bazaar Package Importer
  • Author(s): David Paleino
  • Date: 2010-03-05 18:12:51 UTC
  • mfrom: (8.2.8 sid)
  • Revision ID: james.westby@ubuntu.com-20100305181251-0fcsn0sty5oy8wlq
Tags: 1.7.0+ds1-2
http://bugs.debian.org/572599
Fix RC bug: daemon doesn't start anymore because copy.deepcopy()
fails with the iniparse object, coming from 20-use_iniparse.patch.
Bug 568326 reopened. (Closes: #572599)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/22-fix_deprecation.patch
 
1
From: David Paleino <dapal@debian.org>
 
2
Subject: fix deprecation warnings
 
3
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=571314
 
4
Forwarded: no
 
5
 
 
6
---
 
7
 gtk/gui.py |    6 +++---
 
8
 1 file changed, 3 insertions(+), 3 deletions(-)
 
9
 
 
10
--- wicd.orig/gtk/gui.py
 
11
+++ wicd/gtk/gui.py
 
12
@@ -430,7 +430,7 @@ class appGui(object):
 
13
             gobject.idle_add(self.all_network_list.set_sensitive, True)
 
14
             gobject.idle_add(self.status_area.hide_all)
 
15
         if self.statusID:
 
16
-            gobject.idle_add(self.status_bar.remove, 1, self.statusID)
 
17
+            gobject.idle_add(self.status_bar.remove_message, 1, self.statusID)
 
18
     
 
19
     def set_connecting_state(self, info):
 
20
         if not self.connecting:
 
21
@@ -445,7 +445,7 @@ class appGui(object):
 
22
             gobject.idle_add(self.all_network_list.set_sensitive, False)
 
23
             gobject.idle_add(self.status_area.show_all)
 
24
         if self.statusID:
 
25
-            gobject.idle_add(self.status_bar.remove, 1, self.statusID)
 
26
+            gobject.idle_add(self.status_bar.remove_message, 1, self.statusID)
 
27
         if info[0] == "wireless":
 
28
             gobject.idle_add(self.set_status, str(info[1]) + ': ' +
 
29
                    language[str(wireless.CheckWirelessConnectingMessage())])
 
30
@@ -698,7 +698,7 @@ class appGui(object):
 
31
             cancel_button.set_sensitive(True)
 
32
             self.all_network_list.set_sensitive(False)
 
33
             if self.statusID:
 
34
-                gobject.idle_add(self.status_bar.remove, 1, self.statusID)
 
35
+                gobject.idle_add(self.status_bar.remove_message, 1, self.statusID)
 
36
             gobject.idle_add(self.set_status, language["disconnecting_active"])
 
37
             gobject.idle_add(self.status_area.show_all)
 
38
             self.wait_for_events()