meld r1279 - in trunk: . glade2

[vincele svn gnome org]

Author: vincele
Date: Fri Mar 20 01:17:30 2009
New Revision: 1279
URL: http://svn.gnome.org/viewvc/meld?rev=1279&view=rev

Log:
Multi VC ComboBox GTK Assertion fix

Fix "GtkWarning assertion GTK_IS_TREE_MODEL"
by removing the ComboBox from the glade file
and doing the work with code instead.


Modified:
   trunk/glade2/vcview.glade
   trunk/vcview.py

Modified: trunk/glade2/vcview.glade
==============================================================================
--- trunk/glade2/vcview.glade	(original)
+++ trunk/glade2/vcview.glade	Fri Mar 20 01:17:30 2009
@@ -44,21 +44,6 @@
 	      <property name="fill">True</property>
 	    </packing>
 	  </child>
-
-            <child>
-              <widget class="GtkComboBox" id="combobox_vcs">
-                <property name="visible">True</property>
-                <property name="sensitive">False</property>
-                <property name="active">0</property>
-                <property name="tooltip" translatable="no">Version Control</property>
-                <signal name="changed" handler="on_vc_change"/>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-              </packing>
-            </child>
-
 	</widget>
 	<packing>
 	  <property name="padding">0</property>

Modified: trunk/vcview.py
==============================================================================
--- trunk/vcview.py	(original)
+++ trunk/vcview.py	Fri Mar 20 01:17:30 2009
@@ -191,12 +191,16 @@
             self.on_console_view_toggle(self.console_hide_box)
         self.vc = None
         # VC ComboBox
+        self.combobox_vcs = gtk.ComboBox()
         self.combobox_vcs.lock = True
         self.combobox_vcs.set_model(gtk.ListStore(str, object))
         cell = gtk.CellRendererText()
         self.combobox_vcs.pack_start(cell, False)
         self.combobox_vcs.add_attribute(cell, 'text', 0)
         self.combobox_vcs.lock = False
+        self.hbox2.pack_end(self.combobox_vcs, expand=False)
+        self.combobox_vcs.show()
+        self.combobox_vcs.connect("changed", self.on_vc_change)
 
     def choose_vc(self, vcs):
         """Display VC plugin(s) that can handle the location"""