LogoopenSUSE Build Service > Projects
Sign Up | Log In

View File BitTorrent-4.0.4-gtk-deprecated.patch of Package BitTorrent (Project home:fschuett)

--- BitTorrent/GUI.py
+++ BitTorrent/GUI.py
@@ -299,12 +299,12 @@
                                    type, buttons, message)
 
         self.set_size_request(-1, -1)
-        self.set_resizable(gtk.FALSE)
+        self.set_resizable(False)
         self.set_title(title)
         if default is not None:
             self.set_default_response(default)
         
-        self.label.set_line_wrap(gtk.TRUE)
+        self.label.set_line_wrap(True)
 
         self.connect('response', self.callback)
 
@@ -342,8 +342,8 @@
             except:
                 fullname = fullname.decode(self.fsenc)
             self.main = main
-            self.set_modal(gtk.TRUE)
-            self.set_destroy_with_parent(gtk.TRUE)
+            self.set_modal(True)
+            self.set_destroy_with_parent(True)
             self.set_title(title)
             if (got_location_func is None and
                 got_multiple_location_func is not None):
@@ -444,8 +444,8 @@
                 self.set_filter(self.torrent_filter)
 
             self.main = main
-            self.set_modal(gtk.TRUE)
-            self.set_destroy_with_parent(gtk.TRUE)
+            self.set_modal(True)
+            self.set_destroy_with_parent(True)
             if fullname:
                 if action == gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER:
                     if gtk.gtk_version < (2,6):
--- btdownloadgui.py
+++ btdownloadgui.py
@@ -341,7 +341,7 @@
         Window.__init__(self)
         self.set_title('New %s version available'%app_name)
         self.set_border_width(SPACING)
-        self.set_resizable(gtk.FALSE)
+        self.set_resizable(False)
         self.main = main
         self.newversion = newversion
         self.download_url = download_url
@@ -369,14 +369,14 @@
         self.newversionbutton = gtk.Button('Download _now')
         self.newversionbutton.connect('clicked', self.get_newversion)
 
-        self.bbox.pack_end(self.newversionbutton, expand=gtk.FALSE, fill=gtk.FALSE)
-        self.bbox.pack_end(self.closebutton     , expand=gtk.FALSE, fill=gtk.FALSE)
+        self.bbox.pack_end(self.newversionbutton, expand=False, fill=False)
+        self.bbox.pack_end(self.closebutton     , expand=False, fill=False)
 
         self.checkbox = gtk.CheckButton('_Remind me later')
         self.checkbox.set_active(True)
         self.checkbox.connect('toggled', self.remind_toggle)
         
-        self.bbox.pack_start(self.checkbox, expand=gtk.FALSE, fill=gtk.FALSE)
+        self.bbox.pack_start(self.checkbox, expand=False, fill=False)
 
         self.vbox.pack_start(self.bbox)
         
@@ -426,7 +426,7 @@
         l = credits_f.read()
         credits_f.close()
         label = gtk.Label(l.strip())
-        label.set_line_wrap(gtk.TRUE)
+        label.set_line_wrap(True)
         label.set_selectable(True)
         label.set_justify(gtk.JUSTIFY_CENTER)
         label.set_size_request(250,-1)
@@ -1571,8 +1571,8 @@
     def show_menu(self, widget, event):
         if event.type == gtk.gdk.BUTTON_PRESS and event.button == 3:
             widget.popup(None, None, None, event.button, event.time)
-            return gtk.TRUE
-        return gtk.FALSE
+            return True
+        return False
 
     def _short_path(self, dlpath):
         path_length = 40
@@ -1676,7 +1676,7 @@
             self.parent.highlight_before_index(self.index)
         else:
             self.parent.highlight_after_index(self.index)
-        return gtk.FALSE
+        return False
 
     def drag_end(self, *args):
         self.parent.highlight_child()
@@ -1989,7 +1989,7 @@
 
     def drag_motion(self, *args):
         self.drag_highlight()
-        return gtk.FALSE
+        return False
 
 
 class DroppableBox(HSeparatedBox):
@@ -2003,7 +2003,7 @@
         self.connect('drag_motion', self.drag_motion)
 
     def drag_motion(self, *args):
-        return gtk.FALSE
+        return False
 
     def drag_data_received(self, *args):
         pass
@@ -2099,13 +2099,13 @@
                 self.put_infohash_first(selection.data)
             else:
                 self.put_infohash_last(selection.data)
-            return gtk.TRUE
+            return True
         else:
             print 'got external type'
-            return gtk.FALSE
+            return False
 
     def drag_motion(self, *args):
-        return gtk.FALSE
+        return False
 
     def drag_highlight(self):
         final = self.get_children()[-1]
@@ -2245,7 +2245,7 @@
         self.lists = {}
         self.update_handle = None
         self.unhighlight_handle = None
-        gtk.threads_enter()
+        gtk.gdk.threads_enter()
         self.mainwindow = Window(gtk.WINDOW_TOPLEVEL)
         self.mainwindow.set_border_width(0)
 
@@ -2318,7 +2318,7 @@
         self.helpmenu.set_submenu(build_menu(help_menu_items, self.accel_group))
         self.helpmenu.show()
 
-        self.helpmenu.set_right_justified(gtk.TRUE)
+        self.helpmenu.set_right_justified(True)
 
         self.menubar.append(self.filemenu)
         self.menubar.append(self.viewmenu)
@@ -2357,7 +2357,7 @@
         self.knownbox.set_border_width(SPACING)
 
         self.knownscroll.add_with_viewport(self.knownbox)
-        self.paned.pack1(self.knownscroll, resize=gtk.FALSE, shrink=gtk.TRUE)
+        self.paned.pack1(self.knownscroll, resize=False, shrink=True)
 
         
         self.mainscroll = AutoScrollingWindow()
@@ -2380,7 +2380,7 @@
 
         self.mainscroll.add_with_viewport(self.scrollbox)
 
-        self.paned.pack2(self.mainscroll, resize=gtk.TRUE, shrink=gtk.FALSE)
+        self.paned.pack2(self.mainscroll, resize=True, shrink=False)
 
         self.box1.pack_start(self.paned)
 
@@ -2397,11 +2397,11 @@
         self.set_size()
         self.mainwindow.show()
         self.paned.set_position(0)
-        gtk.threads_leave()
+        gtk.gdk.threads_leave()
 
 
     def main(self):
-        gtk.threads_enter()
+        gtk.gdk.threads_enter()
 
         self.ssbutton.set_paused(self.config['pause'])
         self.rate_slider_box.start()
@@ -2737,7 +2737,7 @@
         self.drag_highlight()
         gobject.source_remove(self.unhighlight_handle)
         self.unhighlight_handle = None
-        return gtk.FALSE
+        return False
 
     def init_updates(self):
         if self.update_handle is not None:
@@ -2799,7 +2799,7 @@
             t.widget = KnownTorrentBox(infohash, t.metainfo, t.dlpath,
                                        t.completion, self)
             box = self.knownbox
-        box.pack_start(t.widget, expand=gtk.FALSE, fill=gtk.FALSE)
+        box.pack_start(t.widget, expand=False, fill=False)
         if queuepos is not None:
             box.reorder_child(t.widget, queuepos)
 
@@ -3064,21 +3064,21 @@
         controlsocket.send_command('show_error', '%s already running'%app_name)
         sys.exit(1)
 
-    gtk.threads_init()
+    gtk.gdk.threads_init()
 
     torrentqueue = TorrentQueue.TorrentQueue(config, ui_options, controlsocket)
     d = DownloadInfoFrame(config,TorrentQueue.ThreadWrappedQueue(torrentqueue))
 
     def lock_wrap(function, *args):
-        gtk.threads_enter()
+        gtk.gdk.threads_enter()
         function(*args)
         gtk.gdk.flush()
-        gtk.threads_leave()
+        gtk.gdk.threads_leave()
 
     def gtk_wrap(function, *args):
-        gtk.threads_enter()
+        gtk.gdk.threads_enter()
         gobject.idle_add(lock_wrap, function, *args)
-        gtk.threads_leave()
+        gtk.gdk.threads_leave()
     startflag = threading.Event()
     dlthread = threading.Thread(target = torrentqueue.run,
                                 args = (d, gtk_wrap, startflag))
--- btmaketorrentgui.py
+++ btmaketorrentgui.py
@@ -251,7 +251,7 @@
         self.flag = Event() # ???
 
         self.label = gtk.Label('Checking file sizes...')
-        self.label.set_line_wrap(gtk.TRUE)
+        self.label.set_line_wrap(True)
 
         self.vbox.set_spacing(SPACING)
         self.vbox.pack_start(lalign(self.label), expand=False, fill=False)