meld r1116 - in trunk: . glade2

[kaiw svn gnome org]

Author: kaiw
Date: Sat Jan  3 22:49:22 2009
New Revision: 1116
URL: http://svn.gnome.org/viewvc/meld?rev=1116&view=rev

Log:
Fix some minor gtk/gobject deprecation warnings

Modified:
   trunk/filediff.py
   trunk/glade2/meldapp.glade
   trunk/melddoc.py
   trunk/undo.py

Modified: trunk/filediff.py
==============================================================================
--- trunk/filediff.py	(original)
+++ trunk/filediff.py	Sat Jan  3 22:49:22 2009
@@ -166,7 +166,7 @@
         self.find_dialog = None
         self.last_search = None
         self.set_num_panes(num_panes)
-        gtk.idle_add( lambda *args: self.load_font()) # hack around Bug 316730
+        gobject.idle_add( lambda *args: self.load_font()) # hack around Bug 316730
 
     def _update_regexes(self):
         self.regexes = []
@@ -999,7 +999,7 @@
 
             # the line to search for in the 'master' text
             master_y = adjustment.value + adjustment.page_size * syncpoint
-            it = self.textview[master].get_line_at_y(master_y)[0]
+            it = self.textview[master].get_line_at_y(int(master_y))[0]
             line_y, height = self.textview[master].get_line_yrange(it)
             line = it.get_line() + ((master_y-line_y)/height)
 
@@ -1021,7 +1021,7 @@
                         obegin = c[3]
                 fraction = (line - mbegin) / ((mend - mbegin) or 1)
                 other_line = (obegin + fraction * (oend - obegin))
-                it = self.textview[i].get_buffer().get_iter_at_line(other_line)
+                it = self.textview[i].get_buffer().get_iter_at_line(int(other_line))
                 val, height = self.textview[i].get_line_yrange(it)
                 val -= (adj.page_size) * syncpoint
                 val += (other_line-int(other_line)) * height

Modified: trunk/glade2/meldapp.glade
==============================================================================
--- trunk/glade2/meldapp.glade	(original)
+++ trunk/glade2/meldapp.glade	Sat Jan  3 22:49:22 2009
@@ -805,7 +805,7 @@
                                       <widget class="GtkSpinButton" id="spinbutton_tabsize">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property name="adjustment">4 1 8 1 10 10</property>
+                                        <property name="adjustment">4 1 8 1 10 0</property>
                                         <property name="climb_rate">1</property>
                                         <signal name="changed" handler="on_spinbutton_tabsize_changed"/>
                                       </widget>

Modified: trunk/melddoc.py
==============================================================================
--- trunk/melddoc.py	(original)
+++ trunk/melddoc.py	Sat Jan  3 22:49:22 2009
@@ -36,7 +36,7 @@
     }
 
     def __init__(self, prefs):
-        self.__gobject_init__()
+        gobject.GObject.__init__(self)
         self.undosequence = undo.UndoSequence()
         self.undosequence_busy = 0
         self.scheduler = task.FifoScheduler()

Modified: trunk/undo.py
==============================================================================
--- trunk/undo.py	(original)
+++ trunk/undo.py	Sat Jan  3 22:49:22 2009
@@ -57,7 +57,7 @@
     def __init__(self):
         """Create an empty UndoSequence.
         """
-        self.__gobject_init__()
+        gobject.GObject.__init__(self)
         self.actions = []
         self.next_redo = 0
         self.group = None