gossip r2722 - in trunk: . src

[rhult svn gnome org]

Author: rhult
Date: Thu Feb  7 14:29:13 2008
New Revision: 2722
URL: http://svn.gnome.org/viewvc/gossip?rev=2722&view=rev

Log:
2008-02-07  Richard Hult  <richard imendio com>

	* configure.ac:
	* src/Makefile.am:
	* src/gossip-app.c:
	* src/gossip-chat-window.c: Use installed mac integration library
	instead of an internal copy.


Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/src/Makefile.am
   trunk/src/gossip-app.c
   trunk/src/gossip-chat-window.c

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Thu Feb  7 14:29:13 2008
@@ -47,18 +47,21 @@
    gconf_pkgconfig=gconf-2.0
    gnome_vfs_pkgconfig=gnome-vfs-2.0
    libgnomeui_pkgconfig=libgnomeui-2.0
+   platform_pkgconfig=
    PLATFORM_CFLAGS=
    PLATFORM_LDFLAGS=
 elif test "x$IGE_PLATFORM" = xosx; then
    gconf_pkgconfig=
    gnome_vfs_pkgconfig=
    libgnomeui_pkgconfig=
+   platform_pkgconfig=ige-mac-integration
    PLATFORM_CFLAGS="-xobjective-c"
    PLATFORM_LDFLAGS="-framework Carbon -framework AppKit -framework IOKit -lobjc"
 elif test "x$IGE_PLATFORM" = xwin32; then
    gconf_pkgconfig=
    gnome_vfs_pkgconfig=
    libgnomeui_pkgconfig=
+   platform_pkgconfig=
    PLATFORM_CFLAGS="-mms-bitfields"
    PLATFORM_LDFLAGS="-no-undefined -mwindows"
 else
@@ -273,6 +276,7 @@
    $libnotify_pkgconfig
    $libgnomeui_pkgconfig
    $gnome_vfs_pkgconfig
+   $platform_pkgconfig
 ])
 
 PKG_CHECK_MODULES(GOSSIP_JABBER,

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Thu Feb  7 14:29:13 2008
@@ -29,15 +29,10 @@
 libnotify_sources = gossip-notify.c gossip-notify.h
 endif
 
-if HAVE_PLATFORM_OSX
-platform_sources = ige-mac-menu.c ige-mac menu.h
-endif
-
 # Main application 
 bin_PROGRAMS = gossip
 
 gossip_SOURCES = 				                        	\
-	$(platform_sources)		     	                           	\
 	$(dbus_sources)			     	                           	\
 	$(galago_sources)		     	                           	\
 	$(libnotify_sources)		     	                           	\

Modified: trunk/src/gossip-app.c
==============================================================================
--- trunk/src/gossip-app.c	(original)
+++ trunk/src/gossip-app.c	Thu Feb  7 14:29:13 2008
@@ -30,6 +30,10 @@
 #include <glade/glade.h>
 #include <glib/gi18n.h>
 
+#ifdef GDK_WINDOWING_QUARTZ
+#include <ige-mac-menu.h>
+#endif
+
 #include <libgossip/gossip-chatroom.h>
 #include <libgossip/gossip-contact.h>
 #include <libgossip/gossip-event.h>
@@ -82,10 +86,6 @@
 #include "gossip-notify.h"
 #endif
 
-#ifdef GDK_WINDOWING_QUARTZ
-#include "ige-mac-menu.h"
-#endif
-
 #define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GOSSIP_TYPE_APP, GossipAppPriv))
 
 #define DEBUG_DOMAIN_SETUP     "AppSetup"

Modified: trunk/src/gossip-chat-window.c
==============================================================================
--- trunk/src/gossip-chat-window.c	(original)
+++ trunk/src/gossip-chat-window.c	Thu Feb  7 14:29:13 2008
@@ -27,6 +27,10 @@
 #include <glade/glade.h>
 #include <glib/gi18n.h>
 
+#ifdef GDK_WINDOWING_QUARTZ
+#include <ige-mac-menu.h>
+#endif
+
 #include <libgossip/gossip-contact.h>
 #include <libgossip/gossip-debug.h>
 #include <libgossip/gossip-chatroom.h>
@@ -50,10 +54,6 @@
 #include "gossip-sound.h"
 #include "gossip-ui-utils.h"
 
-#ifdef GDK_WINDOWING_QUARTZ
-#include "ige-mac-menu.h"
-#endif
-
 #define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GOSSIP_TYPE_CHAT_WINDOW, GossipChatWindowPriv))
 
 #define DEBUG_DOMAIN "ChatWindow"