change: on mac, use macport's gtk-osx-application instead of ige-mac-integration.

diff --git a/README.macos b/README.macos
index 1648a3135fb691a05c030efbcdd84a4788dbd760..2c64ea1b1c9eea987415f236e8cb8df2ccccff88 100644 (file)
--- a/README.macos
+++ b/README.macos
@@ -33,7 +33,7 @@ You need:
 
 - Install gtk. It is recommended to use the quartz backend for better integration.
  $ port install gtk2 +quartz +no_x11
- $ port install ige-mac-integration
+ $ port install gtk-osx-application -python27
  $ port install hicolor-icon-theme
 
 - Compile and install the tunnel

diff --git a/configure.ac b/configure.ac
index 43efbff30198fdf33b0d9d468fca786c578d989a..2e2e562329bb452f7f4e71adf363721b746c5d64 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -229,7 +229,7 @@ AC_ARG_ENABLE(gtk_ui,
 if test "$gtk_ui" = "true" ; then
        PKG_CHECK_MODULES(LIBGTK, gtk+-2.0 >= 2.18.0 gthread-2.0)
        if test "$enable_x11" = "false" ; then
-               PKG_CHECK_MODULES(LIBGTKMAC,[ige-mac-integration >= 0.9.7 ])
+               PKG_CHECK_MODULES(LIBGTKMAC,[gtk-mac-integration >= 2.0.1])
                AC_DEFINE([HAVE_GTK_OSX],[1],[Defined when gtk osx is used])
        fi
 else

diff --git a/gtk/main.c b/gtk/main.c
index 242b7f0be8c8b5f6116124471ee52a9c85bdd537..b31396b0857c233b6b5b43a9e86133db41b42e18 100644 (file)
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -1419,10 +1419,10 @@ static gboolean do_icon_blink(GtkStatusIcon *gi){
 void linphone_gtk_status_icon_set_blinking(gboolean val){
 #ifdef HAVE_GTK_OSX
        static gint attention_id;
-       GtkOSXApplication *theMacApp=(GtkOSXApplication*)g_object_new(GTK_TYPE_OSX_APPLICATION, NULL);
+       GtkosxApplication *theMacApp=gtkosx_application_get();
        if (val)
-               attention_id=gtk_osxapplication_attention_request(theMacApp,CRITICAL_REQUEST);
-       else gtk_osxapplication_cancel_attention_request(theMacApp,attention_id);
+               attention_id=gtkosx_application_attention_request(theMacApp,CRITICAL_REQUEST);
+       else gtkosx_application_cancel_attention_request(theMacApp,attention_id);
 #else
        if (icon!=NULL){
                guint tout;
@@ -1728,10 +1728,10 @@ static void linphone_gtk_init_main_window(){
 #ifdef HAVE_GTK_OSX
        {
                GtkWidget *menubar=linphone_gtk_get_widget(main_window,"menubar1");
-               GtkOSXApplication *theMacApp = (GtkOSXApplication*)g_object_new(GTK_TYPE_OSX_APPLICATION, NULL);
-               gtk_osxapplication_set_menu_bar(theMacApp,GTK_MENU_SHELL(menubar));
+               GtkosxApplication *theMacApp = gtkosx_application_get();
+               gtkosx_application_set_menu_bar(theMacApp,GTK_MENU_SHELL(menubar));
                gtk_widget_hide(menubar);
-               gtk_osxapplication_ready(theMacApp);
+               gtkosx_application_ready(theMacApp);
        }
        g_signal_connect(G_OBJECT(main_window), "window-state-event",G_CALLBACK(on_window_state_event), NULL);
 #endif
@@ -1936,7 +1936,7 @@ int main(int argc, char *argv[]){
        add_pixmap_directory(PACKAGE_DATA_DIR "/pixmaps/linphone");
 
 #ifdef HAVE_GTK_OSX
-       GtkOSXApplication *theMacApp = (GtkOSXApplication*)g_object_new(GTK_TYPE_OSX_APPLICATION, NULL);
+       GtkosxApplication *theMacApp = gtkosx_application_get();
        g_signal_connect(G_OBJECT(theMacApp),"NSApplicationDidBecomeActive",(GCallback)linphone_gtk_show_main_window,NULL);
        g_signal_connect(G_OBJECT(theMacApp),"NSApplicationWillTerminate",(GCallback)gtk_main_quit,NULL);
        /*never block termination:*/