Merge branch 'deprecated' into 'master'
Fix deprecation warnings See merge request !143
This commit is contained in:
		
						commit
						c4c08ad645
					
				
					 3 changed files with 4 additions and 5 deletions
				
			
		| 
						 | 
					@ -422,7 +422,7 @@ class ChangeActivityDialog:
 | 
				
			||||||
                hbox = Gtk.HBox(homogeneous=False, spacing=5)
 | 
					                hbox = Gtk.HBox(homogeneous=False, spacing=5)
 | 
				
			||||||
                hbox.pack_start(gtkgui_helpers.load_activity_icon(category,
 | 
					                hbox.pack_start(gtkgui_helpers.load_activity_icon(category,
 | 
				
			||||||
                        activity), False, False, 0)
 | 
					                        activity), False, False, 0)
 | 
				
			||||||
                hbox.pack_start(Gtk.Label(pep.ACTIVITIES[category][activity]),
 | 
					                hbox.pack_start(Gtk.Label(label=pep.ACTIVITIES[category][activity]),
 | 
				
			||||||
                        False, False, 0)
 | 
					                        False, False, 0)
 | 
				
			||||||
                rbtns[act].connect('toggled', self.on_rbtn_toggled,
 | 
					                rbtns[act].connect('toggled', self.on_rbtn_toggled,
 | 
				
			||||||
                        [category, activity])
 | 
					                        [category, activity])
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -212,7 +212,7 @@ class EmoticonPopover(Gtk.Popover):
 | 
				
			||||||
                        widget = Gtk.Image()
 | 
					                        widget = Gtk.Image()
 | 
				
			||||||
                        widget.set_from_pixbuf(pix)
 | 
					                        widget.set_from_pixbuf(pix)
 | 
				
			||||||
                    else:
 | 
					                    else:
 | 
				
			||||||
                        widget = Gtk.Label(pix)
 | 
					                        widget = Gtk.Label(label=pix)
 | 
				
			||||||
                flowbox.add(widget)
 | 
					                flowbox.add(widget)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        notebook.show_all()
 | 
					        notebook.show_all()
 | 
				
			||||||
| 
						 | 
					@ -226,7 +226,7 @@ class EmoticonPopover(Gtk.Popover):
 | 
				
			||||||
            button.get_child().set_from_pixbuf(pixbuf_list[0])
 | 
					            button.get_child().set_from_pixbuf(pixbuf_list[0])
 | 
				
			||||||
        else:
 | 
					        else:
 | 
				
			||||||
            button.remove(button.get_child())
 | 
					            button.remove(button.get_child())
 | 
				
			||||||
            label = Gtk.Label(pixbuf_list[0])
 | 
					            label = Gtk.Label(label=pixbuf_list[0])
 | 
				
			||||||
            button.add(label)
 | 
					            button.add(label)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        button.connect('button-press-event', self.on_modifier_press)
 | 
					        button.connect('button-press-event', self.on_modifier_press)
 | 
				
			||||||
| 
						 | 
					@ -247,7 +247,7 @@ class EmoticonPopover(Gtk.Popover):
 | 
				
			||||||
                widget = Gtk.Image()
 | 
					                widget = Gtk.Image()
 | 
				
			||||||
                widget.set_from_pixbuf(pix)
 | 
					                widget.set_from_pixbuf(pix)
 | 
				
			||||||
            else:
 | 
					            else:
 | 
				
			||||||
                widget = Gtk.Label(pix)
 | 
					                widget = Gtk.Label(label=pix)
 | 
				
			||||||
            flowbox.add(widget)
 | 
					            flowbox.add(widget)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        flowbox.show_all()
 | 
					        flowbox.show_all()
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -79,7 +79,6 @@ class PluginsWindow(object):
 | 
				
			||||||
        self.installed_plugins_model = Gtk.ListStore(object, str, bool, bool,
 | 
					        self.installed_plugins_model = Gtk.ListStore(object, str, bool, bool,
 | 
				
			||||||
            GdkPixbuf.Pixbuf)
 | 
					            GdkPixbuf.Pixbuf)
 | 
				
			||||||
        self.installed_plugins_treeview.set_model(self.installed_plugins_model)
 | 
					        self.installed_plugins_treeview.set_model(self.installed_plugins_model)
 | 
				
			||||||
        self.installed_plugins_treeview.set_rules_hint(True)
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
        renderer = Gtk.CellRendererText()
 | 
					        renderer = Gtk.CellRendererText()
 | 
				
			||||||
        col = Gtk.TreeViewColumn(_('Plugin'))#, renderer, text=Column.NAME)
 | 
					        col = Gtk.TreeViewColumn(_('Plugin'))#, renderer, text=Column.NAME)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		
		Reference in a new issue