[gtksourceview/gnome-3-6] Update to gtk-mac-integration 2.0 API

[Philip Chimento <pchimento src gnome org>]

commit 111e07615a37cc4372feea30155416d249a01a8b
Author: Pierre Boutillier <pierre boutillier ens-lyon org>
Date:   Tue Nov 6 15:49:43 2012 +0100

    Update to gtk-mac-integration 2.0 API
    
    Fixes bgo#687766. quartz_application_... becomes
    gtkosx_application_...
    
    https://bugzilla.gnome.org/show_bug.cgi?id=687766
    
    Conflicts:
        tests/Makefile.am

 configure.ac                       |    2 +-
 gtksourceview/gtksourceview-i18n.c |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 4c41594..44e6280 100644
--- a/configure.ac
+++ b/configure.ac
@@ -92,7 +92,7 @@ AM_CONDITIONAL([OS_OSX], [ test "$os_osx" = "yes" ])
 if test "$os_osx" = "yes"; then
        AC_DEFINE([OS_OSX], [1], [Defined if os is Mac OSX])
 
-       PKG_CHECK_MODULES(GTK_MAC, gtk-mac-integration)
+       PKG_CHECK_MODULES(GTK_MAC, gtk-mac-integration >= 2.0.0)
 fi
 
 # Check for Glade3
diff --git a/gtksourceview/gtksourceview-i18n.c b/gtksourceview/gtksourceview-i18n.c
index 64e392a..25b9009 100644
--- a/gtksourceview/gtksourceview-i18n.c
+++ b/gtksourceview/gtksourceview-i18n.c
@@ -45,9 +45,9 @@ get_locale_dir (void)
 
        g_free (win32_dir);
 #elif defined (OS_OSX)
-       if (quartz_application_get_bundle_id () != NULL)
+       if (gtkosx_application_get_bundle_id () != NULL)
        {
-               locale_dir = g_build_filename (quartz_application_get_resource_path (), "share", "locale", 
NULL);
+               locale_dir = g_build_filename (gtkosx_application_get_resource_path (), "share", "locale", 
NULL);
        }
        else
        {