r3374 - in trunk/src/target/OM-2007.2/applications/openmoko-appmanager2: . src
thomas at sita.openmoko.org
thomas at sita.openmoko.org
Thu Nov 8 10:55:49 CET 2007
Author: thomas
Date: 2007-11-08 10:55:44 +0100 (Thu, 08 Nov 2007)
New Revision: 3374
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/src/Makefile.am
trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/src/appmanager-data.c
trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/src/appmanager-data.h
trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/src/appmanager-window.c
Log:
* src/Makefile.am:
* src/appmanager-data.c: (application_manager_data_init):
* src/appmanager-data.h:
* src/appmanager-window.c: (main):
Remove menus from build
Modified: trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/ChangeLog 2007-11-07 17:32:38 UTC (rev 3373)
+++ trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/ChangeLog 2007-11-08 09:55:44 UTC (rev 3374)
@@ -1,3 +1,12 @@
+2007-11-08 Thomas Wood <thomas at openedhand.com>
+
+ * src/Makefile.am:
+ * src/appmanager-data.c: (application_manager_data_init):
+ * src/appmanager-data.h:
+ * src/appmanager-window.c: (main):
+
+ Remove menus from build
+
2007-11-07 Thomas Wood <thomas at openedhand.com>
* src/appmanager-data.h:
Modified: trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/src/Makefile.am
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/src/Makefile.am 2007-11-07 17:32:38 UTC (rev 3373)
+++ trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/src/Makefile.am 2007-11-08 09:55:44 UTC (rev 3374)
@@ -3,7 +3,6 @@
bin_PROGRAMS = openmoko-appmanager
openmoko_appmanager_SOURCES = appmanager-window.c\
- application-menu.c\
ipkgapi.c\
navigation-area.c\
tool-box.c\
@@ -11,7 +10,6 @@
appmanager-data.c\
package-list.c\
pixbuf-list.c\
- select-menu.c\
apply-dialog.c\
install-dialog.c \
search-bar.c \
Modified: trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/src/appmanager-data.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/src/appmanager-data.c 2007-11-07 17:32:38 UTC (rev 3373)
+++ trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/src/appmanager-data.c 2007-11-08 09:55:44 UTC (rev 3374)
@@ -37,7 +37,6 @@
data->mwindow = NULL;
data->menubox = NULL;
- data->selectmenu = NULL;
data->searchentry = NULL;
data->tvpkglist = NULL;
data->tvdetail = NULL;
@@ -100,20 +99,6 @@
}
/*
- * @brief Set the select menu to the application manager data
- * @param appdata The application manager data struct
- * @param selectmenu The select menu
- */
-void
-application_manager_data_set_select_menu (ApplicationManagerData *appdata,
- GtkMenu *selectmenu)
-{
- g_return_if_fail (MOKO_IS_APPLICATION_MANAGER_DATA (appdata));
-
- appdata->selectmenu = selectmenu;
-}
-
-/*
* @brief Set the search entry to the application manager data
* @param appdata The application manager data struct
* @param entry The search entry
@@ -388,19 +373,6 @@
}
/*
- * @brief Get the select menu from the application manager data
- * @param appdata The application manager data
- * @return The select menu
- */
-GtkMenu *
-application_manager_get_select_menu (ApplicationManagerData *appdata)
-{
- g_return_val_if_fail (MOKO_IS_APPLICATION_MANAGER_DATA (appdata), NULL);
-
- return appdata->selectmenu;
-}
-
-/*
* @brief Get the search entry from the application manager data
* @param appdata The application manager data
* @return The search entry
Modified: trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/src/appmanager-data.h
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/src/appmanager-data.h 2007-11-07 17:32:38 UTC (rev 3373)
+++ trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/src/appmanager-data.h 2007-11-08 09:55:44 UTC (rev 3374)
@@ -55,7 +55,6 @@
GtkWidget *mwindow; /* The main window */
GtkWidget *menubox; /* The menubox */
- GtkMenu *selectmenu; /* The select menu */
GtkEntry *searchentry; /* The search entry */
GtkWidget *tvpkglist; /* The treeview of the package list */
GtkWidget *tvdetail; /* The textview of the details info */
Modified: trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/src/appmanager-window.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/src/appmanager-window.c 2007-11-07 17:32:38 UTC (rev 3373)
+++ trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/src/appmanager-window.c 2007-11-08 09:55:44 UTC (rev 3374)
@@ -28,7 +28,6 @@
#include "appmanager-data.h"
#include "errorcode.h"
#include "package-list.h"
-#include "select-menu.h"
#include "search-bar.h"
#include "ipkg-utils.h"
@@ -41,10 +40,6 @@
{
ApplicationManagerData *appdata;
GtkWidget *window;
- GtkWidget *menubox;
- GtkWidget *menuitem;
- GtkWidget *appmenu;
- GtkWidget *selectmenu;
GtkWidget *navigation;
GtkWidget *toolbox;
GtkWidget *detail;
@@ -84,27 +79,6 @@
vbox = gtk_vbox_new (FALSE, 0);
gtk_container_add (GTK_CONTAINER (appdata->mwindow), vbox);
- appmenu = application_menu_new (appdata);
-
- selectmenu = moko_select_menu_new (appdata);
- application_manager_data_set_select_menu (appdata, GTK_MENU (selectmenu));
-
-
- /* Save the menubox to the application manager data */
- menubox = gtk_menu_bar_new ();
- gtk_box_pack_start (GTK_BOX (vbox), menubox, FALSE, FALSE, 0);
-
- application_manager_data_set_menubox (appdata, menubox);
-
-
- menuitem = gtk_menu_item_new_with_label ("Package");
- gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), appmenu);
- gtk_menu_shell_append (GTK_MENU_SHELL (menubox), menuitem);
-
- menuitem = gtk_menu_item_new_with_label ("Select");
- gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), selectmenu);
- gtk_menu_shell_append (GTK_MENU_SHELL (menubox), menuitem);
-
notebook = gtk_notebook_new ();
gtk_notebook_set_tab_pos (GTK_NOTEBOOK (notebook), GTK_POS_BOTTOM);
gtk_box_pack_start (GTK_BOX (vbox), notebook, TRUE, TRUE, 0);
More information about the commitlog
mailing list
