r2245 - in trunk/src/target/OM-2007/openmoko-libs: . libmokoui

[mickey at sita.openmoko.org]

Author: mickey
Date: 2007-06-14 09:19:03 +0200 (Thu, 14 Jun 2007)
New Revision: 2245

Modified:
   trunk/src/target/OM-2007/openmoko-libs/TODO
   trunk/src/target/OM-2007/openmoko-libs/configure.ac
   trunk/src/target/OM-2007/openmoko-libs/libmokoui/Makefile.am
   trunk/src/target/OM-2007/openmoko-libs/libmokoui/libmokoui.pro
   trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-application.c
Log:
openmoko-libs: add MokoBanner


Modified: trunk/src/target/OM-2007/openmoko-libs/TODO
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/TODO	2007-06-14 06:21:41 UTC (rev 2244)
+++ trunk/src/target/OM-2007/openmoko-libs/TODO	2007-06-14 07:19:03 UTC (rev 2245)
@@ -1,6 +1,6 @@
 (Ordered by Priority)
 
-- MokoApplication -> GSettings, set theme
+- change profiles for audio subsystem 
 - split up into individually buildable libraries (esp. regarding pkgconfig support)
 - MokoPopupMenu:
   -- moko_popup_menu_add_item( label, callback, userdata, notification );

Modified: trunk/src/target/OM-2007/openmoko-libs/configure.ac
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/configure.ac	2007-06-14 06:21:41 UTC (rev 2244)
+++ trunk/src/target/OM-2007/openmoko-libs/configure.ac	2007-06-14 07:19:03 UTC (rev 2245)
@@ -27,13 +27,15 @@
                   gdk-pixbuf-2.0
                   libgsmd)
 
+AM_PATH_LIBXOSD(have_xosd=true,AC_MSG_ERROR([*** Required libxosd not installed ***]))
+
 if test x$MOKO_DEVEL = xon ; then
     AC_MSG_NOTICE([removing -O2 from CFLAGS])
     CFLAGS="-g -Wall"
 fi
 
-LIBS="$LIBS $DEPS_LIBS"
-CFLAGS="$CFLAGS $DEPS_CFLAGS"
+LIBS="$LIBS $DEPS_LIBS $LIBXOSD_LIBS"
+CFLAGS="$CFLAGS $DEPS_CFLAGS $LIBXOSD_CLFAGS"
 
 AC_SUBST(LIBS)
 

Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/Makefile.am
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/Makefile.am	2007-06-14 06:21:41 UTC (rev 2244)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/Makefile.am	2007-06-14 07:19:03 UTC (rev 2245)
@@ -2,6 +2,7 @@
     moko-ui.h \
     moko-alignment.h \
     moko-application.h \
+    moko-banner.h \
     moko-details-window.h \
     moko-dialog-window.h \
     moko-finger-tool-box.h \
@@ -24,6 +25,7 @@
 source_c = \
     moko-alignment.c \
     moko-application.c \
+    moko-banner.c \
     moko-details-window.c \
     moko-dialog-window.c \
     moko-finger-tool-box.c \
@@ -53,7 +55,7 @@
 lib_LTLIBRARIES      = libmokoui.la
 libmokoui_la_SOURCES     = $(source_c) $(source_h)
 libmokoui_la_LIBADD      =
-libmokoui_la_LDFLAGS = -version-info 0:1:0
+libmokoui_la_LDFLAGS = -version-info 0:2:0
 
 libopenmokouiheadersdir = $(includedir)/openmoko-libs/libmokoui
 libopenmokouiheaders_DATA = $(source_h)

Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/libmokoui.pro
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/libmokoui.pro	2007-06-14 06:21:41 UTC (rev 2244)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/libmokoui.pro	2007-06-14 07:19:03 UTC (rev 2245)
@@ -1,10 +1,11 @@
 TEMPLATE = lib
-VERSION = 0.0.3
+VERSION = 0.2.0
 TARGET = mokoui
 
 HEADERS = \
     moko-alignment.h \
     moko-application.h \
+    moko-banner.h \
     moko-details-window.h \
     moko-dialog.h \
     moko-dialog-window.h \
@@ -28,6 +29,7 @@
 SOURCES = \
     moko-alignment.c \
     moko-application.c \
+    moko-banner.c \
     moko-details-window.c \
     moko-dialog.c \
     moko-dialog-window.c \
@@ -48,5 +50,7 @@
     moko-window.c
 
 PKGCONFIG += gtk+-2.0
+QMAKE_CFLAGS += `xosd-config --cflags`
+LIBS += `xosd-config --libs`
 
 include ( $(OPENMOKODIR)/devel/qmake/openmoko-include.pro )

Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-application.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-application.c	2007-06-14 06:21:41 UTC (rev 2244)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-application.c	2007-06-14 07:19:03 UTC (rev 2245)
@@ -113,11 +113,6 @@
     priv->icon_factory = gtk_icon_factory_new();
     gtk_icon_factory_add_default( priv->icon_factory );
 
-#if 0
-    moko_application_add_stock_icons( self,
-                                      "openmoko-default-application",
-                                      NULL );
-#endif
     priv->windows = NULL;
     priv->is_topmost = FALSE;
     priv->window_group = GDK_WINDOW_XID(gdk_display_get_default_group(gdk_display_get_default()));
@@ -127,7 +122,7 @@
     priv->net_active_window_atom = XInternAtom( GDK_DISPLAY(), "_NET_ACTIVE_WINDOW", False );
     priv->seen_matchbox_atom = FALSE;
 
-    moko_stock_register ();
+    moko_stock_register();
 }
 
 static void moko_application_finalize (GObject *self)