r2315 - in trunk: oe/conf/distro/include oe/packages/openmoko-panel-plugins oe/packages/tasks src/target/OM-2007/panel-plugins src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src
stefan at sita.openmoko.org
stefan at sita.openmoko.org
Thu Jun 21 00:42:58 CEST 2007
Author: stefan
Date: 2007-06-21 00:42:53 +0200 (Thu, 21 Jun 2007)
New Revision: 2315
Removed:
trunk/oe/packages/openmoko-panel-plugins/openmoko-panel-startup_svn.bb
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-startup/
Modified:
trunk/oe/conf/distro/include/preferred-openmoko-versions.inc
trunk/oe/packages/tasks/task-openmoko.bb
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/configure.ac
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/Makefile.am
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/openmoko-panel-mainmenu.c
Log:
* Remove our own fork of the startup panel applet. This is upstream now and
works well.
Modified: trunk/oe/conf/distro/include/preferred-openmoko-versions.inc
===================================================================
--- trunk/oe/conf/distro/include/preferred-openmoko-versions.inc 2007-06-20 22:26:38 UTC (rev 2314)
+++ trunk/oe/conf/distro/include/preferred-openmoko-versions.inc 2007-06-20 22:42:53 UTC (rev 2315)
@@ -83,4 +83,3 @@
SRCDATE_openmoko-panel-gps = "now"
SRCDATE_openmoko-panel-bt = "now"
SRCDATE_openmoko-panel-usb = "now"
-#SRCDATE_openmoko-panel-startup = "now"
Deleted: trunk/oe/packages/openmoko-panel-plugins/openmoko-panel-startup_svn.bb
===================================================================
--- trunk/oe/packages/openmoko-panel-plugins/openmoko-panel-startup_svn.bb 2007-06-20 22:26:38 UTC (rev 2314)
+++ trunk/oe/packages/openmoko-panel-plugins/openmoko-panel-startup_svn.bb 2007-06-20 22:42:53 UTC (rev 2315)
@@ -1,6 +0,0 @@
-DESCRIPTON = "Shows the application startup in the OpenMoko panel"
-DEPENDS += "startup-notification"
-PV = "0.0.1+svn${SRCDATE}"
-PR = "r1"
-
-inherit openmoko-panel-plugin
Modified: trunk/oe/packages/tasks/task-openmoko.bb
===================================================================
--- trunk/oe/packages/tasks/task-openmoko.bb 2007-06-20 22:26:38 UTC (rev 2314)
+++ trunk/oe/packages/tasks/task-openmoko.bb 2007-06-20 22:42:53 UTC (rev 2315)
@@ -105,7 +105,6 @@
openmoko-panel-clock \
openmoko-panel-usb \
openmoko-panel-gps \
-# openmoko-panel-startup \
"
#
Modified: trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/configure.ac
===================================================================
--- trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/configure.ac 2007-06-20 22:26:38 UTC (rev 2314)
+++ trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/configure.ac 2007-06-20 22:42:53 UTC (rev 2315)
@@ -19,11 +19,14 @@
AC_MSG_ERROR([*** Required Startup Notification library not installed ***]))
PKG_CHECK_MODULES(LIBPULSE, libpulse,,
AC_MSG_ERROR([*** Required pulseaudio client library not installed ***]))
+PKG_CHECK_MODULES(DBUSGLIB, dbus-glib-1,,
+ AC_MSG_ERROR([*** Required dbus-glib-1 not installed ***]))
+PKG_CHECK_MODULES(DBUS, dbus-1,,
+ AC_MSG_ERROR([*** Required dbus-1 not installed ***]))
+LIBS="$LIBS $OPENMOKO_LIBS $LIBMB_LIBS $LIBSN_LIBS $LIBPULSE_LIBS $DBUSGLIB_LIBS $DBUS_LIBS"
+CFLAGS="$CFLAGS $OPENMOKO_CFLAGS $LIBMB_CFLAGS $LIBSN_CFLAGS $LIBPULSE_CFLAGS $DBUSGLIB_CFLAGS $DBUS_CFALGS"
-LIBS="$LIBS $OPENMOKO_LIBS $LIBMB_LIBS $LIBSN_LIBS $LIBPULSE_LIBS"
-CFLAGS="$CFLAGS $OPENMOKO_CFLAGS $LIBMB_CFLAGS $LIBSN_CFLAGS $LIBPULSE_CFLAGS"
-
# output stuff
AC_OUTPUT([
Makefile
Modified: trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/Makefile.am
===================================================================
--- trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/Makefile.am 2007-06-20 22:26:38 UTC (rev 2314)
+++ trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/Makefile.am 2007-06-20 22:42:53 UTC (rev 2315)
@@ -9,7 +9,14 @@
buttonactions.c \
stylusmenu.c \
mokodesktop.c \
- mokodesktop_item.c
+ mokodesktop_item.c \
+ fingermenu.c \
+ mainmenu.c \
+ mokoiconview.c \
+ callbacks.c \
+ app-history.c \
+ dbus-conn.c
+
libopenmoko_panel_mainmenu_la_LIBADD = @OPENMOKO_LIBS@ @LIBMB_LIBS@ @LIBSN_LIBS@
MAINTAINERCLEANFILES = Makefile.in
Modified: trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/openmoko-panel-mainmenu.c
===================================================================
--- trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/openmoko-panel-mainmenu.c 2007-06-20 22:26:38 UTC (rev 2314)
+++ trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/openmoko-panel-mainmenu.c 2007-06-20 22:42:53 UTC (rev 2315)
@@ -21,8 +21,12 @@
#include "stylusmenu.h"
#include "mokodesktop.h"
#include "mokodesktop_item.h"
+#include "callbacks.h"
+#include "fingermenu.h"
+#include "dbus-conn.h"
#include <libmokoui/moko-panel-applet.h>
+#include <libmokoui/moko-window.h>
#include <gtk/gtk.h>
#include <gdk/gdkx.h>
@@ -32,7 +36,16 @@
#include <unistd.h>
+/*typedef struct _MokoMainmenuApp MokoMainmenuApp;
+
+struct _MokoMainmenuApp {
+ MokoFingerMenu *fm;
+ MokoStylusMenu *sm;
+ MokoDesktopItem *top_item;
+};*/
+
static GtkWidget *sm = NULL;
+static MokoMainmenuApp *mma;
static void click(MokoPanelApplet * applet)
{
@@ -70,6 +83,45 @@
XSendEvent(DisplayOfScreen(screen), RootWindowOfScreen(screen), False,
SubstructureRedirectMask | SubstructureNotifyMask, &xev);
+
+ mma = g_malloc0 (sizeof (MokoMainmenuApp));
+ if (!mma)
+ {
+ g_error ("openmoko-mainmenu application initialize FAILED.");
+ exit (0);
+ }
+ memset (mma, 0, sizeof (MokoMainmenuApp));
+
+ if (!moko_dbus_connect_init ())
+ {
+ g_error ("Failed to initial dbus connection.");
+ exit (0);
+ }
+
+ // moko_mainmenu_init (mma, argc, argv);
+
+ /* Buid Root item, don't display */
+ mma->top_item = mokodesktop_item_new_with_params ("Home",
+ NULL,
+ NULL,
+ ITEM_TYPE_ROOT );
+
+ /* Build Lists (parse .directory and .desktop files) */
+ mokodesktop_init(mma->top_item, ITEM_TYPE_CNT);
+
+// gtk_init();
+
+ /*MokoFingerMenu object*/
+ mma->fm = moko_finger_menu_new ();
+ moko_finger_menu_build (mma->fm, mma->top_item);
+ moko_finger_menu_show (mma->fm);
+
+ gtk_main();
+
+ if (mma)
+ {
+ g_free (mma);
+ }
}
G_MODULE_EXPORT GtkWidget *mb_panel_applet_create(const char *id,
More information about the commitlog
mailing list
