[meld] Avoid some deprecation warnings

[Kai Willadsen <kaiw src gnome org>]

commit 5ef5653e60d4490245b25b751f1ad9b5f789daaf
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Wed Feb 5 08:53:05 2014 +1000

    Avoid some deprecation warnings

 meld/dirdiff.py |    6 +++---
 meld/meldapp.py |    4 ++--
 meld/tree.py    |    4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/meld/dirdiff.py b/meld/dirdiff.py
index 7438e29..485422d 100644
--- a/meld/dirdiff.py
+++ b/meld/dirdiff.py
@@ -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)),
                         )
                     )
 
diff --git a/meld/meldapp.py b/meld/meldapp.py
index 29992b1..81090f5 100644
--- a/meld/meldapp.py
+++ b/meld/meldapp.py
@@ -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
 
diff --git a/meld/tree.py b/meld/tree.py
index 98a1048..c4a479e 100644
--- a/meld/tree.py
+++ b/meld/tree.py
@@ -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):