gossip r2809 - in trunk: . src

[rhult svn gnome org]

Author: rhult
Date: Sun May 18 15:03:36 2008
New Revision: 2809
URL: http://svn.gnome.org/viewvc/gossip?rev=2809&view=rev

Log:
2008-05-18  Richard Hult  <richard imendio com>

	* configure.ac: Require new mac integration version.

	* src/gossip-app.c: (app_setup): Setup mac menu key handler.

	* src/ige-mac-menu.[ch]: Those should have been removed a while
	ago.


Removed:
   trunk/src/ige-mac-menu.c
   trunk/src/ige-mac-menu.h
Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/src/gossip-app.c

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sun May 18 15:03:36 2008
@@ -54,7 +54,7 @@
    gconf_pkgconfig=
    gnome_vfs_pkgconfig=
    libgnomeui_pkgconfig=
-   platform_pkgconfig=ige-mac-integration
+   platform_pkgconfig="ige-mac-integration >= 0.8.2"
    PLATFORM_CFLAGS="-xobjective-c"
    PLATFORM_LDFLAGS="-framework Carbon -framework AppKit -framework IOKit -lobjc"
 elif test "x$IGE_PLATFORM" = xwin32; then

Modified: trunk/src/gossip-app.c
==============================================================================
--- trunk/src/gossip-app.c	(original)
+++ trunk/src/gossip-app.c	Sun May 18 15:03:36 2008
@@ -31,7 +31,7 @@
 #include <glib/gi18n.h>
 
 #ifdef GDK_WINDOWING_QUARTZ
-#include <ige-mac-menu.h>
+#include <ige-mac-integration.h>
 #endif
 
 #include <libgossip/gossip-chatroom.h>
@@ -843,6 +843,9 @@
 
 		gtk_widget_set_name (priv->window, "small-font");
 
+                /*ige_mac_menu_connect_window_key_handler (GTK_WINDOW (priv->window));*/
+		ige_mac_menu_set_global_key_handler_enabled (TRUE);
+
 		ige_mac_menu_set_menu_bar (GTK_MENU_SHELL (priv->menu_bar));
 
 		item = glade_xml_get_widget (glade, "chat_quit");