r2316 - in trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu: . src

[stefan at sita.openmoko.org]

Author: stefan
Date: 2007-06-21 00:55:31 +0200 (Thu, 21 Jun 2007)
New Revision: 2316

Modified:
   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:
* Revert local changes commited by mistake.


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:42:53 UTC (rev 2315)
+++ trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/configure.ac	2007-06-20 22:55:31 UTC (rev 2316)
@@ -19,14 +19,11 @@
                  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:42:53 UTC (rev 2315)
+++ trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/Makefile.am	2007-06-20 22:55:31 UTC (rev 2316)
@@ -9,14 +9,7 @@
   buttonactions.c \
   stylusmenu.c \
   mokodesktop.c \
-  mokodesktop_item.c \
-  fingermenu.c \
-  mainmenu.c \
-  mokoiconview.c \
-  callbacks.c \
-  app-history.c \
-  dbus-conn.c
-
+  mokodesktop_item.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:42:53 UTC (rev 2315)
+++ trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/openmoko-panel-mainmenu.c	2007-06-20 22:55:31 UTC (rev 2316)
@@ -21,12 +21,8 @@
 #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>
@@ -36,16 +32,7 @@
 
 #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)
 {
@@ -83,45 +70,6 @@
 
 	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,