Changeset 3374

Timestamp:

11/08/07 10:55:44 (6 years ago)

Author:

thomas

Message:

• src/Makefile.am:
• src/appmanager-data.c: (application_manager_data_init):
• src/appmanager-data.h:
• src/appmanager-window.c: (main):

Remove menus from build

Location:

trunk/src/target/OM-2007.2/applications/openmoko-appmanager2

Files:

• ChangeLog (modified) (1 diff)
• src/Makefile.am (modified) (2 diffs)
• src/appmanager-data.c (modified) (3 diffs)
• src/appmanager-data.h (modified) (1 diff)
• src/appmanager-window.c (modified) (3 diffs)

trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/ChangeLog

@@ +1 @@
+2007-11-08  Thomas Wood  <thomas@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@openedhand.com>
 

trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/src/Makefile.am

@@ -4 +4 @@
 
 openmoko_appmanager_SOURCES = appmanager-window.c\
-                              application-menu.c\
                               ipkgapi.c\
                               navigation-area.c\
@@ -12 +11 @@
                               package-list.c\
                               pixbuf-list.c\
-                              select-menu.c\
                               apply-dialog.c\
                               install-dialog.c \

trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/src/appmanager-data.c

@@ -38 +38 @@
   data->mwindow = NULL;
   data->menubox = NULL;
-  data->selectmenu = NULL;
   data->searchentry = NULL;
   data->tvpkglist = NULL;
@@ -101 +100 @@
 
 /*
- * @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
@@ -389 +374 @@
 
 /*
- * @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

trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/src/appmanager-data.h

@@ -56 +56 @@
   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 */

trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/src/appmanager-window.c

@@ -29 +29 @@
 #include "errorcode.h"
 #include "package-list.h"
-#include "select-menu.h"
 #include "search-bar.h"
 
@@ -42 +41 @@
   ApplicationManagerData *appdata;
   GtkWidget       *window;
-  GtkWidget       *menubox;
-  GtkWidget       *menuitem;
-  GtkWidget       *appmenu;
-  GtkWidget       *selectmenu;
   GtkWidget       *navigation;
   GtkWidget       *toolbox;
@@ -84 +79 @@
   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 ();