[gcompris] macosx: replaced ige-mac-integration by gtk-mac-integration
- From: Bruno Coudoin <bcoudoin src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gcompris] macosx: replaced ige-mac-integration by gtk-mac-integration
- Date: Sat, 30 Jun 2012 14:00:53 +0000 (UTC)
commit 3ab813465c8a4c6c3d419787d724178e92ad7fcf
Author: Bruno Coudoin <bruno coudoin gcompris net>
Date: Sat Jun 30 16:00:30 2012 +0200
macosx: replaced ige-mac-integration by gtk-mac-integration
This is the new official name for this library.
src/gcompris/Makefile.am | 4 ++--
src/gcompris/binreloc.c | 18 +++++++++---------
src/gcompris/gcompris.c | 4 ++--
3 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/src/gcompris/Makefile.am b/src/gcompris/Makefile.am
index 3b947ff..d9fe1d9 100644
--- a/src/gcompris/Makefile.am
+++ b/src/gcompris/Makefile.am
@@ -41,7 +41,7 @@ INCLUDES = \
$(GNET_CFLAGS) \
$(AUDIO_CFLAGS) \
$(cairo_cflags) \
- ${IGE_MAC_CFLAGS}
+ ${GTK_MAC_CFLAGS}
gcompris_SOURCES = \
$(cairo_c) \
@@ -119,7 +119,7 @@ gcompris_LDADD = \
$(GCOMPRIS_LIBS) $(sqlite_ldadd) $(XML_LIBS) $(GNET_LIBS) \
$(AUDIO_LIBS) \
$(INTLLIBS) \
- ${IGE_MAC_LIBS}
+ ${GTK_MAC_LIBS}
marshal_sources = \
gc-marshal.c \
diff --git a/src/gcompris/binreloc.c b/src/gcompris/binreloc.c
index 599e4bc..5726165 100644
--- a/src/gcompris/binreloc.c
+++ b/src/gcompris/binreloc.c
@@ -26,8 +26,8 @@
#include "binreloc.h"
#ifdef MAC_INTEGRATION
-#include <igemacintegration/ige-mac-bundle.h>
-static IgeMacBundle *bundle = NULL;
+#include <gtkmacintegration/gtk-mac-bundle.h>
+static GtkMacBundle *bundle = NULL;
#endif
G_BEGIN_DECLS
@@ -67,19 +67,19 @@ _br_find_exe (GbrInitError *error)
#elif MAC_INTEGRATION
gchar *prefix = NULL, *result = NULL;
g_type_init();
- bundle = ige_mac_bundle_new();
+ bundle = gtk_mac_bundle_new();
if (!bundle) {
*error = GBR_INIT_ERROR_MAC_NOT_BUNDLE;
return NULL;
}
- if (!ige_mac_bundle_get_is_app_bundle (bundle)) {
+ if (!gtk_mac_bundle_get_is_app_bundle (bundle)) {
g_object_unref(bundle);
bundle = NULL;
*error = GBR_INIT_ERROR_MAC_NOT_APP_BUNDLE;
return NULL;
}
- ige_mac_bundle_setup_environment(bundle);
- prefix = g_strdup(ige_mac_bundle_get_path(bundle));
+ gtk_mac_bundle_setup_environment(bundle);
+ prefix = g_strdup(gtk_mac_bundle_get_path(bundle));
result = g_build_filename(prefix, "Contents/MacOS",
"GCompris-bin", NULL);
g_free(prefix);
@@ -601,7 +601,7 @@ gbr_find_data_dir (const gchar *default_data_dir)
}
#ifdef MAC_INTEGRATION
- dir = g_strdup(ige_mac_bundle_get_datadir(bundle));
+ dir = g_strdup(gtk_mac_bundle_get_datadir(bundle));
#else
dir = g_build_filename (prefix, "share", NULL);
#endif
@@ -638,7 +638,7 @@ gbr_find_locale_dir (const gchar *default_locale_dir)
}
#ifdef MAC_INTEGRATION
- dir = g_strdup(ige_mac_bundle_get_localedir(bundle));
+ dir = g_strdup(gtk_mac_bundle_get_localedir(bundle));
#else
dir = g_build_filename (data_dir, "locale", NULL);
#endif
@@ -675,7 +675,7 @@ gbr_find_lib_dir (const gchar *default_lib_dir)
}
#ifdef MAC_INTEGRATION
- dir = g_build_filename(ige_mac_bundle_get_datadir(bundle),
+ dir = g_build_filename(gtk_mac_bundle_get_datadir(bundle),
"..", "lib", NULL);
#else
if (default_lib_dir && strstr(default_lib_dir, "lib64"))
diff --git a/src/gcompris/gcompris.c b/src/gcompris/gcompris.c
index 0daf8a3..c7780ea 100644
--- a/src/gcompris/gcompris.c
+++ b/src/gcompris/gcompris.c
@@ -37,7 +37,7 @@
// Include Mac OS X menu synchronization on native OSX build
#ifdef MAC_INTEGRATION
-#include "ige-mac-menu.h"
+#include "gtk-mac-menu.h"
#endif
#include <glib/gstdio.h>
@@ -760,7 +760,7 @@ init_workspace()
#ifdef MAC_INTEGRATION
GtkWidget *quit_item;
quit_item = gtk_menu_item_new();
- ige_mac_menu_set_quit_menu_item(GTK_MENU_ITEM (quit_item));
+ gtk_mac_menu_set_quit_menu_item(GTK_MENU_ITEM (quit_item));
g_signal_connect(GTK_OBJECT (quit_item),
"activate", G_CALLBACK (quit_cb), NULL);
gtk_widget_show (quit_item);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]