Commit 5ef5653e authored by Kai Willadsen's avatar Kai Willadsen

Avoid some deprecation warnings

parent 9d438d4a
......@@ -925,9 +925,9 @@ class DirDiff(melddoc.MeldDoc, gnomeglade.Component):
misc.error_dialog(
_("Error copying file"),
_("Couldn't copy %s\nto %s.\n\n%s") % (
GObject.markup_escape_text(src),
GObject.markup_escape_text(dst),
GObject.markup_escape_text(str(err)),
GLib.markup_escape_text(src),
GLib.markup_escape_text(dst),
GLib.markup_escape_text(str(err)),
)
)
......
......@@ -21,7 +21,7 @@ import os
from gettext import gettext as _
from gi.repository import Gio
from gi.repository import GObject
from gi.repository import GLib
from gi.repository import Gdk
from gi.repository import Gtk
......@@ -36,7 +36,7 @@ class MeldApp(Gtk.Application):
Gtk.Application.__init__(self)
self.set_flags(Gio.ApplicationFlags.HANDLES_COMMAND_LINE)
self.set_application_id("org.gnome.meld")
GObject.set_application_name("Meld")
GLib.set_application_name("Meld")
Gtk.Window.set_default_icon_name("meld")
self.window = None
......
......@@ -15,7 +15,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import os
from gi.repository import GObject
from gi.repository import GLib
from gi.repository import Gtk
from gi.repository import Pango
......@@ -138,7 +138,7 @@ class DiffTreeStore(Gtk.TreeStore):
def set_path_state(self, it, pane, state, isdir=0):
fullname = self.get_value(it, self.column_index(COL_PATH,pane))
name = GObject.markup_escape_text(os.path.basename(fullname))
name = GLib.markup_escape_text(os.path.basename(fullname))
self.set_state(it, pane, state, name, isdir)
def set_state(self, it, pane, state, label, isdir=0):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment