[giggle] Remove already broken OSX integration
- From: Javier Jardón <jjardon src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [giggle] Remove already broken OSX integration
- Date: Wed, 17 Nov 2010 17:19:48 +0000 (UTC)
commit 17d402b6e07c114901e526d0f2132a0ff697b757
Author: Javier Jardón <jjardon gnome org>
Date: Wed Nov 17 18:12:22 2010 +0100
Remove already broken OSX integration
The support is already broken and we are using the old and
deprecated Carbon (ige-mac-integration) implementation.
If someone interested, we should use the new Cocoa
(GtkOSXApplication) implementation instead.
acinclude.m4 | 36 --
configure.ac | 15 -
src/Makefile.am | 9 -
src/giggle-window.c | 42 ---
src/ige-mac-menu.c | 913 ---------------------------------------------------
src/ige-mac-menu.h | 44 ---
6 files changed, 0 insertions(+), 1059 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index da20542..7fa3b5f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -138,21 +138,6 @@ dnl -------------
GNOME_DOC_INIT([0.17.3])
dnl -----------------------
-dnl | GTK+ platform check |----------------------------------
-dnl -----------------------
-IGE_PLATFORM_CHECK
-if test "x$IGE_PLATFORM" = xx11; then
- PLATFORM_CFLAGS=
- PLATFORM_LDFLAGS=
-else
- PLATFORM_CFLAGS=
- PLATFORM_LDFLAGS="-framework Carbon"
-fi
-AC_SUBST(PLATFORM_CFLAGS)
-AC_SUBST(PLATFORM_LDFLAGS)
-
-
-dnl -----------------------
dnl | GIT command detection |----------------------------------
dnl -----------------------
AC_ARG_WITH([git-command],
diff --git a/src/Makefile.am b/src/Makefile.am
index a93ee6a..f6dbaf8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -75,15 +75,6 @@ giggle_SOURCES = \
giggle_LDADD = \
../libgiggle-git/libgiggle-git.la
-if IGE_PLATFORM_OSX
-
-giggle_SOURCES += \
- ige-mac-menu.c \
- ige-mac-menu.h \
- $(NULL)
-
-endif
-
#test_graph_renderer_SOURCES = \
# giggle-revision.c giggle-revision.h \
# giggle-graph-renderer.c giggle-graph-renderer.h \
diff --git a/src/giggle-window.c b/src/giggle-window.c
index 19d13fa..6d3129a 100644
--- a/src/giggle-window.c
+++ b/src/giggle-window.c
@@ -39,10 +39,6 @@
#include <libgiggle-git/giggle-git-config.h>
-#ifdef GDK_WINDOWING_QUARTZ
-#include "ige-mac-menu.h"
-#endif
-
#include <glib/gi18n.h>
#include <string.h>
#include <stdlib.h>
@@ -546,44 +542,6 @@ giggle_window_clipboard_init (GiggleClipboardIface *iface)
iface->do_copy = window_do_copy;
}
-#if 0
-static void
-window_create_menu (GiggleWindow *window)
-{
- GiggleWindowPriv *priv;
- GtkActionGroup *action_group;
- GError *error = NULL;
-
- priv = window->priv;;
-
-
-#ifdef GDK_WINDOWING_QUARTZ
- {
- GtkWidget *menu;
- GtkWidget *item;
- IgeMacMenuGroup *group;
-
- menu = gtk_ui_manager_get_widget (priv->ui_manager,
- "/MainMenubar");
-
- ige_mac_menu_set_menu_bar (GTK_MENU_SHELL (menu));
- gtk_widget_hide (menu);
-
- item = gtk_ui_manager_get_widget (priv->ui_manager,
- "/MainMenubar/ProjectMenu/Quit");
- ige_mac_menu_set_quit_menu_item (GTK_MENU_ITEM (item));
-
- item = gtk_ui_manager_get_widget (priv->ui_manager,
- "/MainMenubar/HelpMenu/About");
- group = ige_mac_menu_add_app_menu_group ();
- ige_mac_menu_add_app_menu_item (group, GTK_MENU_ITEM (item),
- _("About Giggle"));
- }
-#endif
-}
-
-#endif
-
void
giggle_window_set_directory (GiggleWindow *window,
const gchar *directory)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]