[monkey-bubble: 747/753] TEMP
- From: Sven Herzberg <herzi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [monkey-bubble: 747/753] TEMP
- Date: Wed, 14 Jul 2010 22:58:29 +0000 (UTC)
commit c990a0507f2be5cbebbb3333bc0db0ddcfc11584
Author: Sven Herzberg <herzi gnome-de org>
Date: Wed Jul 14 21:15:20 2010 +0200
TEMP
configure.in | 2 +-
src/ui/Makefile.am | 7 ++++---
src/ui/main.c | 4 ++--
src/ui/ui-main.c | 2 +-
4 files changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/configure.in b/configure.in
index 81762ee..38ed5b5 100644
--- a/configure.in
+++ b/configure.in
@@ -147,7 +147,7 @@ AC_SUBST(UI_CFLAGS)
AC_SUBST(UI_LIBS)
if test "$with_platform" = "gnome"; then
- PKG_CHECK_MODULES(PLATFORM,[libgnomeui-2.0])
+ PKG_CHECK_MODULES(PLATFORM,[libgnome-2.0 libbonoboui-2.0 libgnomecanvas-2.0 gnome-vfs-2.0])
elif test "$with_platform" = "maemo"; then
PKG_CHECK_MODULES(PLATFORM,[hildon-1 libosso conic])
fi
diff --git a/src/ui/Makefile.am b/src/ui/Makefile.am
index 63e6204..c569589 100644
--- a/src/ui/Makefile.am
+++ b/src/ui/Makefile.am
@@ -43,11 +43,12 @@ monkey_bubble_LDFLAGS=
monkey_bubble_LDADD = \
- $(UI_LIBS) \
- $(PLATFORM_LIBS) \
../monkey/libmonkey.a \
../view/libmonkeyview.a \
../util/libmonkeyutil.a \
../net/libmonkeynet.a \
../audio/libmonkeyaudio.a \
- ../input/libmbinput.a
+ ../input/libmbinput.a \
+ $(UI_LIBS) \
+ $(PLATFORM_LIBS) \
+ $(NULL)
diff --git a/src/ui/main.c b/src/ui/main.c
index 93b40b5..c484a9f 100644
--- a/src/ui/main.c
+++ b/src/ui/main.c
@@ -15,7 +15,7 @@
#include <glib/gi18n.h>
#ifdef GNOME
#include <libgnome/gnome-score.h>
-#include <libgnomeui/gnome-ui-init.h>
+#include <libgnome/gnome-init.h>
#endif
#include <glib/gthread.h>
@@ -117,7 +117,7 @@ int main(int argc, char **argv)
#ifdef GNOME
/* to get help working */
gnome_program_init (PACKAGE, VERSION,
- LIBGNOMEUI_MODULE,
+ LIBGNOME_MODULE,
argc, argv,
GNOME_PROGRAM_STANDARD_PROPERTIES,
NULL);
diff --git a/src/ui/ui-main.c b/src/ui/ui-main.c
index ab7a5b8..6085cba 100644
--- a/src/ui/ui-main.c
+++ b/src/ui/ui-main.c
@@ -35,7 +35,7 @@
#include "sound-manager.h"
#ifdef GNOME
-#include <libgnomeui/libgnomeui.h>
+#include <libgnomeui/gnome-scores.h>
#include <libgnome/gnome-score.h>
#include <libgnome/gnome-sound.h>
#include <libgnome/gnome-help.h>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]