Send commitlog mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.openmoko.org/mailman/listinfo/commitlog
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of commitlog digest..."
Today's Topics:
1. r1401 -
trunk/src/target/OM-2007/applications/openmoko-dialer/src
([EMAIL PROTECTED])
2. r1402 -
trunk/src/target/OM-2007/applications/openmoko-messages/src
([EMAIL PROTECTED])
3. r1403 - in
trunk/src/target/OM-2007/applications/openmoko-appmanager: . src
([EMAIL PROTECTED])
4. r1404 -
trunk/src/target/OM-2007/applications/openmoko-appmanager/src
([EMAIL PROTECTED])
--- Begin Message ---
Author: tony_guan
Date: 2007-03-19 04:54:27 +0100 (Mon, 19 Mar 2007)
New Revision: 1401
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.h
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-dialer.c
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-outgoing.c
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-talking.c
Log:
talking window display/dtmf input box/dialer autocomplete.
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.h
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.h
2007-03-19 03:46:34 UTC (rev 1400)
+++
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.h
2007-03-19 03:54:27 UTC (rev 1401)
@@ -77,6 +77,7 @@
GtkWidget *imageTALK;
GtkWidget *imageDTMF;
+ GtkWidget *buttonTalk_DTMF;
GtkWidget *content_talk;
GtkWidget *content_dtmf;
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-dialer.c
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-dialer.c
2007-03-19 03:46:34 UTC (rev 1400)
+++
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-dialer.c
2007-03-19 03:54:27 UTC (rev 1401)
@@ -171,8 +171,6 @@
MOKO_DIALER_APP_DATA *appdata = (MOKO_DIALER_APP_DATA *) user_data;
MokoDialerTextview *moko_dialer_text_view = appdata->moko_dialer_text_view;
DIALER_READY_CONTACT *ready_contact = (DIALER_READY_CONTACT *) para_pointer;
- DBG_MESSAGE ("GOT THE MESSAGE OF SELECTED:%s",
- ready_contact->p_entry->content);
codesinput = moko_dialer_textview_get_input (moko_dialer_text_view, FALSE);
lenstring = g_utf8_strlen (ready_contact->p_entry->content, -1);
leninput = g_utf8_strlen (codesinput, -1);
@@ -184,7 +182,8 @@
content[leninput]));
}
-
+ else
+ moko_dialer_textview_fill_it (moko_dialer_text_view,"");
g_free (codesinput);
}
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-outgoing.c
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-outgoing.c
2007-03-19 03:46:34 UTC (rev 1400)
+++
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-outgoing.c
2007-03-19 03:54:27 UTC (rev 1401)
@@ -59,7 +59,8 @@
//start dialling.
DBG_TRACE ();
- gtk_widget_show_all (appdata->window_talking);
+// gtk_widget_show_all (appdata->window_talking);
+ gtk_widget_show(appdata->window_talking);
DBG_LEAVE ();
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-talking.c
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-talking.c
2007-03-19 03:46:34 UTC (rev 1400)
+++
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-talking.c
2007-03-19 03:54:27 UTC (rev 1401)
@@ -228,8 +228,8 @@
gtk_widget_hide (appdata->wheel_talking);
gtk_widget_hide (appdata->toolbox_talking);
-//DBG_MESSAGE("%s, %s",appdata->g_state.starttime,appdata->g_state.startdate);
- add_histroy_entry (appdata, appdata->g_state.historytype,
+ moko_dialer_textview_empty(appdata->moko_dtmf_text_view);
+ add_histroy_entry (appdata, appdata->g_state.historytype,
appdata->g_peer_info.name,
appdata->g_peer_info.number,
appdata->g_peer_info.picpath,
@@ -244,7 +244,7 @@
{
DBG_ENTER ();
- appdata->dtmf_in_talking_window = TRUE;
+ appdata->dtmf_in_talking_window = TRUE;
//hide the talking button in talking mode.
time_t timep;
@@ -264,9 +264,17 @@
appdata->g_timer_data.ptimer =
g_timeout_add (1000, (GSourceFunc) timer_talking_time_out, appdata);
- if (appdata->toolbox_talking)
- gtk_widget_show (appdata->toolbox_talking);
+ if (appdata->toolbox_talking){
+ gtk_widget_show (appdata->toolbox_talking);
+ moko_pixmap_button_set_finger_toolbox_btn_center_image
(MOKO_PIXMAP_BUTTON (appdata->buttonTalk_DTMF),
+ appdata->
+ imageDTMF);
+ gtk_widget_hide (appdata->content_dtmf);
+ gtk_widget_show(appdata->content_talk);
+ }
+
+
if (appdata->wheel_talking)
gtk_widget_show (appdata->wheel_talking);
@@ -401,6 +409,7 @@
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK (cb_tool_button_dtmf_talk_clicked),
p_dialer_data);
+ p_dialer_data->buttonTalk_DTMF=button;
p_dialer_data->imageDTMF = image;
p_dialer_data->imageTALK =
file_new_image_from_relative_path ("talking.png");
--- End Message ---
--- Begin Message ---
Author: alex_tang
Date: 2007-03-19 07:48:19 +0100 (Mon, 19 Mar 2007)
New Revision: 1402
Modified:
trunk/src/target/OM-2007/applications/openmoko-messages/src/callbacks.c
trunk/src/target/OM-2007/applications/openmoko-messages/src/main.c
trunk/src/target/OM-2007/applications/openmoko-messages/src/main.h
Log:
Store folder names to file foldersdb fixed.
Initialize to "Inbox" folder in filter menu to fix the bug: "Filter
Menu" by default will crash while clicking on the scroll bar.
Remove some unuseful debug information.
Modified:
trunk/src/target/OM-2007/applications/openmoko-messages/src/callbacks.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-messages/src/callbacks.c
2007-03-19 03:54:27 UTC (rev 1401)
+++ trunk/src/target/OM-2007/applications/openmoko-messages/src/callbacks.c
2007-03-19 06:48:19 UTC (rev 1402)
@@ -471,7 +471,6 @@
GdkPixbuf* icon;
GError* error = NULL;
- g_debug( "openmoko-messenger: selection changed" );
view = gtk_tree_selection_get_tree_view( selection );
if ( gtk_tree_selection_get_selected( selection, &model, &iter ) ) {
msg = g_malloc(sizeof(message));
Modified: trunk/src/target/OM-2007/applications/openmoko-messages/src/main.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-messages/src/main.c
2007-03-19 03:54:27 UTC (rev 1401)
+++ trunk/src/target/OM-2007/applications/openmoko-messages/src/main.c
2007-03-19 06:48:19 UTC (rev 1402)
@@ -69,7 +69,6 @@
int main( int argc, char** argv )
{
g_debug( "openmoko-messenger starting up" );
- pid_t lockapp;
/* Initialize GTK+ */
gtk_init( &argc, &argv );
@@ -248,6 +247,13 @@
/* detail area */
populate_detail_area (d);
+ /* Fix default "Filter Menu" bug*/
+ d->currentfolder = g_strdup("Inbox");
+ GtkWidget* menuitem = gtk_menu_get_attach_widget (GTK_MENU(d->filtmenu));
+ GtkWidget* menulabel = GTK_BIN(menuitem)->child;
+ gtk_label_set_text (GTK_LABEL(menulabel),"Inbox");
+ gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER(d->filter));
+
/* select the first column */
gint index = 0;
GtkTreeSelection* tree_selection = gtk_tree_view_get_selection(
GTK_TREE_VIEW(d->view) );
@@ -365,8 +371,11 @@
moko_paned_window_set_lower_pane( d->window,
GTK_WIDGET(moko_details_window_put_in_box(d->details)));
}
-void main_quit(GtkWidget* widget, GdkEvent* event, MessengerData* d)
+void main_quit(GtkMenuItem* item, MessengerData* d)
{
+ if(d == NULL)
+ g_debug ("Message data is null");
+ g_debug ("Folder List length:%d",g_slist_length(d->folderlist));
foldersdb_update (d->folderlist);
gtk_main_quit();
}
Modified: trunk/src/target/OM-2007/applications/openmoko-messages/src/main.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-messages/src/main.h
2007-03-19 03:54:27 UTC (rev 1401)
+++ trunk/src/target/OM-2007/applications/openmoko-messages/src/main.h
2007-03-19 06:48:19 UTC (rev 1402)
@@ -82,7 +82,7 @@
void setup_ui( MessengerData* d );
void populate_navigation_area( MessengerData* d );
void populate_detail_area( MessengerData* d );
-void main_quit(GtkWidget* widget, GdkEvent* event, MessengerData* d);
+void main_quit(GtkMenuItem* item, MessengerData* d);
void update_folder_sensitive (MessengerData* d, GSList* folderlist);
gboolean init_dbus (MessengerData* d);
--- End Message ---
--- Begin Message ---
Author: caowai_song
Date: 2007-03-19 07:55:14 +0100 (Mon, 19 Mar 2007)
New Revision: 1403
Modified:
trunk/src/target/OM-2007/applications/openmoko-appmanager/ChangeLog
trunk/src/target/OM-2007/applications/openmoko-appmanager/README
trunk/src/target/OM-2007/applications/openmoko-appmanager/src/appmanager-data.c
trunk/src/target/OM-2007/applications/openmoko-appmanager/src/appmanager-data.h
trunk/src/target/OM-2007/applications/openmoko-appmanager/src/appmanager-window.c
trunk/src/target/OM-2007/applications/openmoko-appmanager/src/filter-menu.c
trunk/src/target/OM-2007/applications/openmoko-appmanager/src/filter-menu.h
trunk/src/target/OM-2007/applications/openmoko-appmanager/src/package-list.c
Log:
1. After initialization, the appmanager will display the installed
packages list.
2. After install/remove/upgrade packages, the appmanager will
refresh all package list.
Modified: trunk/src/target/OM-2007/applications/openmoko-appmanager/ChangeLog
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-appmanager/ChangeLog
2007-03-19 06:48:19 UTC (rev 1402)
+++ trunk/src/target/OM-2007/applications/openmoko-appmanager/ChangeLog
2007-03-19 06:55:14 UTC (rev 1403)
@@ -0,0 +1,10 @@
+2007-03-19 Chaowei Song <[EMAIL PROTECTED]>
+ * src/package-list.c: (package_list_execute_change):
+ Set a changed flag when install, remove or upgrade a package success.
+ * src/appmanager-data:
+ Add menubox(and set/get function) to the appmanager-data struct.
+ * src/appmanager-window.c: (main)
+ Save the menubox to appmanager-data after initialization.
+ Show installed package list after initialization.
+ * src/filter-menu.c filter-menu.h:
+ Add filter_menu_show_install_list.
Modified: trunk/src/target/OM-2007/applications/openmoko-appmanager/README
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-appmanager/README
2007-03-19 06:48:19 UTC (rev 1402)
+++ trunk/src/target/OM-2007/applications/openmoko-appmanager/README
2007-03-19 06:55:14 UTC (rev 1403)
@@ -1,4 +1,27 @@
-This is the OpenMoko Application Manager.
+ Application Manager README
+ ==========================
-It requires libipkg 0.99.163 with the is-processing.patch.
+Introduction
+============
+Application manager is an "ipk packages" management program. It's
+based on the libmokoui and libipkg. It will hopefully make the process
+ of installing/removing/upgrading packages on neo-1973 become more
+easy.
+
+
+Building
+========
+To build the application manager, you should follow the steps:
+ ./autogen.sh
+ make
+ make install
+
+The application manager needs the libmokoui and libipkg(0.99.163 and
+with the is-processing.patch) to build. The configure script (in the
+autogen scirpt) will detect these. The autogen script need the
+automake tools.
+
+At many times, your build system and running system are different,
+you should rewrite the autogen script when need.
+
Modified:
trunk/src/target/OM-2007/applications/openmoko-appmanager/src/appmanager-data.c
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-appmanager/src/appmanager-data.c
2007-03-19 06:48:19 UTC (rev 1402)
+++
trunk/src/target/OM-2007/applications/openmoko-appmanager/src/appmanager-data.c
2007-03-19 06:55:14 UTC (rev 1403)
@@ -37,6 +37,7 @@
data->mwindow = NULL;
data->filtermenu = NULL;
+ data->menubox = NULL;
data->selectmenu = NULL;
data->searchentry = NULL;
data->tvpkglist = NULL;
@@ -99,6 +100,20 @@
}
/**
+ * @brief Set the menubox to the application manager data
+ * @param appdata The application manager data struct
+ * @param menubox The menubox
+ */
+void
+application_manager_data_set_menubox (ApplicationManagerData *appdata,
+ GtkWidget * menubox)
+{
+ g_return_if_fail (MOKO_IS_APPLICATION_MANAGER_DATA (appdata));
+
+ appdata->menubox = menubox;
+}
+
+/**
* @brief Set the select menu to the application manager data
* @param appdata The application manager data struct
* @param selectmenu The select menu
@@ -385,6 +400,19 @@
return appdata->filtermenu;
}
+/*
+ * @brief Get the menubox from the application manager data
+ * @param appdata The application manager data
+ * @return The menubox
+ */
+GtkWidget *
+application_manager_get_menubox (ApplicationManagerData *appdata)
+{
+ g_return_val_if_fail (MOKO_IS_APPLICATION_MANAGER_DATA (appdata), NULL);
+
+ return appdata->menubox;
+}
+
/**
* @brief Get the select menu from the application manager data
* @param appdata The application manager data
Modified:
trunk/src/target/OM-2007/applications/openmoko-appmanager/src/appmanager-data.h
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-appmanager/src/appmanager-data.h
2007-03-19 06:48:19 UTC (rev 1402)
+++
trunk/src/target/OM-2007/applications/openmoko-appmanager/src/appmanager-data.h
2007-03-19 06:55:14 UTC (rev 1403)
@@ -56,17 +56,18 @@
MokoPanedWindow *mwindow; /* The main window */
GtkMenu *filtermenu; /* The filter menu */
+ 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 */
- gpointer pkglist; /* The package list get from lib ipkg */
- gpointer sectionlist; /* The section list parse from the
package list */
- gpointer installedlist; /* The list of all installed packages */
- gpointer upgradelist; /* The list of all upgradeable packages
*/
- gpointer selectedlist; /* The list of packages that user
selected */
- gpointer nosecpkglist; /* The list of packages whose section
name is NULL */
- gpointer currentlist; /* The current list that display on the
navigation list */
+ gpointer pkglist; /* The package list get from lib ipkg */
+ gpointer sectionlist; /* The section list parse from the
package list */
+ gpointer installedlist; /* The list of all installed packages */
+ gpointer upgradelist; /* The list of all upgradeable packages
*/
+ gpointer selectedlist; /* The list of packages that user
selected */
+ gpointer nosecpkglist; /* The list of packages whose section
name is NULL */
+ gpointer currentlist; /* The current list that display on the
navigation list */
GdkPixbuf *statuspix[N_COUNT_PKG_STATUS]; /* The all pixbufs that
need by the package list store */
gchar *searchhistory; /* The search history */
GtkWidget *installdialog; /* The install dialog */
@@ -90,6 +91,9 @@
void application_manager_data_set_filter_menu (ApplicationManagerData *appdata,
GtkMenu *filtermenu);
+void application_manager_data_set_menubox (ApplicationManagerData *appdata,
+ GtkWidget *menubox);
+
void application_manager_data_set_select_menu (ApplicationManagerData *appdata,
GtkMenu *selectmenu);
@@ -137,6 +141,9 @@
GtkMenu *
application_manager_get_filter_menu (ApplicationManagerData *appdata);
+GtkWidget *
+ application_manager_get_menubox (ApplicationManagerData *appdata);
+
GtkMenu *
application_manager_get_select_menu (ApplicationManagerData *appdata);
Modified:
trunk/src/target/OM-2007/applications/openmoko-appmanager/src/appmanager-window.c
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-appmanager/src/appmanager-window.c
2007-03-19 06:48:19 UTC (rev 1402)
+++
trunk/src/target/OM-2007/applications/openmoko-appmanager/src/appmanager-window.c
2007-03-19 06:55:14 UTC (rev 1403)
@@ -49,8 +49,10 @@
MokoToolBox *toolbox;
GtkWidget *detail;
- gint ret;
+ GtkWidget *menubox;
+ gint ret;
+
g_debug ("appplication manager start up");
gtk_init (&argc, &argv);
@@ -85,6 +87,10 @@
gtk_widget_show (GTK_WIDGET (selectmenu));
application_manager_data_set_select_menu (appdata, selectmenu);
+ /* Save the menubox to the application manager data */
+ menubox = moko_paned_window_get_menubox (window);
+ application_manager_data_set_menubox (appdata, menubox);
+
navigation = navigation_area_new (appdata);
moko_paned_window_set_upper_pane (window, navigation);
@@ -108,8 +114,12 @@
return -1;
}
+ /* Add section list to the filter menu */
package_list_add_section_to_filter_menu (appdata);
+ /* Show the installed package list at initialization */
+ filter_menu_show_install_list (appdata);
+
gtk_widget_show_all (GTK_WIDGET (window));
g_debug ("application manager enter main loop");
gtk_main ();
Modified:
trunk/src/target/OM-2007/applications/openmoko-appmanager/src/filter-menu.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-appmanager/src/filter-menu.c
2007-03-19 06:48:19 UTC (rev 1402)
+++ trunk/src/target/OM-2007/applications/openmoko-appmanager/src/filter-menu.c
2007-03-19 06:55:14 UTC (rev 1403)
@@ -27,7 +27,7 @@
/**
* @brief The callback function of the search result menuitem.
*/
-void
+static void
on_search_result_activate (GtkMenuItem *menuitem, gpointer userdata)
{
g_debug ("Clicked the search result menuitem");
@@ -36,7 +36,7 @@
/**
* @brief The callback function of the installed menuitem.
*/
-void
+static void
on_installed_activate (GtkMenuItem *menuitem, gpointer userdata)
{
gpointer pkglist;
@@ -45,16 +45,17 @@
g_debug ("Clicked the installed menuitem");
pkglist = application_manager_data_get_installedlist (
- MOKO_APPLICATION_MANAGER_DATA (userdata));
+ MOKO_APPLICATION_MANAGER_DATA (userdata));
- navigation_area_refresh_with_package_list (MOKO_APPLICATION_MANAGER_DATA
(userdata),
- pkglist);
+ navigation_area_refresh_with_package_list (
+ MOKO_APPLICATION_MANAGER_DATA (userdata),
+ pkglist);
}
/**
* @brief The callback function of the upgradeable menuitem.
*/
-void
+static void
on_upgradeable_activate (GtkMenuItem *menuitem, gpointer userdata)
{
gpointer pkglist;
@@ -63,16 +64,17 @@
g_debug ("Clicked the upgradeable menuitem");
pkglist = application_manager_data_get_upgradelist (
- MOKO_APPLICATION_MANAGER_DATA (userdata));
+ MOKO_APPLICATION_MANAGER_DATA (userdata));
- navigation_area_refresh_with_package_list (MOKO_APPLICATION_MANAGER_DATA
(userdata),
- pkglist);
+ navigation_area_refresh_with_package_list (
+ MOKO_APPLICATION_MANAGER_DATA (userdata),
+ pkglist);
}
/**
* @brief The callback function of the selected menuitem.
*/
-void
+static void
on_selected_activate (GtkMenuItem *menuitem, gpointer userdata)
{
gpointer pkglist;
@@ -81,10 +83,11 @@
g_debug ("Click the selected menuitem");
pkglist = application_manager_data_get_selectedlist (
- MOKO_APPLICATION_MANAGER_DATA (userdata));
+ MOKO_APPLICATION_MANAGER_DATA (userdata));
- navigation_area_refresh_with_package_list (MOKO_APPLICATION_MANAGER_DATA
(userdata),
- pkglist);
+ navigation_area_refresh_with_package_list (
+ MOKO_APPLICATION_MANAGER_DATA (userdata),
+ pkglist);
}
/**
@@ -116,15 +119,17 @@
return;
}
- pkglist = package_list_get_with_name (MOKO_APPLICATION_MANAGER_DATA
(userdata),
- secname);
+ pkglist = package_list_get_with_name (
+ MOKO_APPLICATION_MANAGER_DATA (userdata),
+ secname);
if (pkglist == NULL)
{
g_debug ("Can not find the section that named:%s", secname);
return;
}
- navigation_area_refresh_with_package_list (MOKO_APPLICATION_MANAGER_DATA
(userdata),
- pkglist);
+ navigation_area_refresh_with_package_list (
+ MOKO_APPLICATION_MANAGER_DATA (userdata),
+ pkglist);
}
/**
@@ -183,7 +188,8 @@
* @param name The label name of the menu item
*/
void
-filter_menu_add_item (GtkMenu *filtermenu, const gchar *name,
+filter_menu_add_item (GtkMenu *filtermenu,
+ const gchar *name,
ApplicationManagerData *appdata)
{
GtkWidget *dymenuitem;
@@ -199,3 +205,27 @@
}
+/*
+ * @brief Show the installed packages list after initialization or
reinitialization
+ * @param appdata The application manager data
+ */
+void
+filter_menu_show_install_list (ApplicationManagerData *appdata)
+{
+ gpointer pkglist;
+ MokoMenuBox *menubox;
+
+ g_return_if_fail (MOKO_IS_APPLICATION_MANAGER_DATA (appdata));
+
+ pkglist = application_manager_data_get_installedlist (
+ MOKO_APPLICATION_MANAGER_DATA (appdata));
+
+ navigation_area_refresh_with_package_list (
+ MOKO_APPLICATION_MANAGER_DATA (appdata),
+ pkglist);
+
+ menubox = MOKO_MENU_BOX (application_manager_get_menubox (appdata));
+
+ g_return_if_fail (IS_MOKO_MENU_BOX (menubox));
+ moko_menu_box_set_active_filter (menubox, _("Installed"));
+}
Modified:
trunk/src/target/OM-2007/applications/openmoko-appmanager/src/filter-menu.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-appmanager/src/filter-menu.h
2007-03-19 06:48:19 UTC (rev 1402)
+++ trunk/src/target/OM-2007/applications/openmoko-appmanager/src/filter-menu.h
2007-03-19 06:55:14 UTC (rev 1403)
@@ -30,5 +30,8 @@
void filter_menu_add_item (GtkMenu *filtermenu, const gchar *name,
ApplicationManagerData *appdata);
+void
+filter_menu_show_install_list (ApplicationManagerData *appdata);
+
#endif
Modified:
trunk/src/target/OM-2007/applications/openmoko-appmanager/src/package-list.c
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-appmanager/src/package-list.c
2007-03-19 06:48:19 UTC (rev 1402)
+++
trunk/src/target/OM-2007/applications/openmoko-appmanager/src/package-list.c
2007-03-19 06:55:14 UTC (rev 1403)
@@ -1403,17 +1403,19 @@
break;
default :
+ ret = -1;
break;
- if (ret == 0)
+
+ }
+ if (ret == 0)
+ {
+ change = TRUE;
+ if (newname != NULL)
{
- change = TRUE;
- if (newname != NULL)
- {
- g_debug ("free new name");
- free (newname);
- g_debug ("free new name success");
- newname = NULL;
- }
+ g_debug ("free new name");
+ free (newname);
+ g_debug ("free new name success");
+ newname = NULL;
}
}
tmplist = tmplist->next;
--- End Message ---
--- Begin Message ---
Author: caowai_song
Date: 2007-03-19 08:20:11 +0100 (Mon, 19 Mar 2007)
New Revision: 1404
Modified:
trunk/src/target/OM-2007/applications/openmoko-appmanager/src/package-list.c
trunk/src/target/OM-2007/applications/openmoko-appmanager/src/tool-box.c
Log:
Show the installed package list after install, remove or upgrade
packages.
Modified:
trunk/src/target/OM-2007/applications/openmoko-appmanager/src/package-list.c
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-appmanager/src/package-list.c
2007-03-19 06:55:14 UTC (rev 1403)
+++
trunk/src/target/OM-2007/applications/openmoko-appmanager/src/package-list.c
2007-03-19 07:20:11 UTC (rev 1404)
@@ -1289,7 +1289,6 @@
/* FIXME The newname of the packages are not used now. */
g_debug ("Begin to install:%s", tmplist->pkg->name);
ret = ipkg_install_cmd (tmplist->pkg->name, "root", &newname);
- g_debug ("************************************************");
g_debug ("Install:%s complete, ret=%d", tmplist->pkg->name, ret);
if (ret == 0)
{
@@ -1317,10 +1316,7 @@
get_error_msg ());
install_dialog_add_install_info (MOKO_INSTALL_DIALOG
(installdialog),
errstr);
- g_debug ("prepare free errstr");
- g_debug ("err =%s", errstr);
g_free (errstr);
- g_debug ("after free errstr");
errstr = NULL;
}
break;
@@ -1412,9 +1408,7 @@
change = TRUE;
if (newname != NULL)
{
- g_debug ("free new name");
free (newname);
- g_debug ("free new name success");
newname = NULL;
}
}
Modified:
trunk/src/target/OM-2007/applications/openmoko-appmanager/src/tool-box.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-appmanager/src/tool-box.c
2007-03-19 06:55:14 UTC (rev 1403)
+++ trunk/src/target/OM-2007/applications/openmoko-appmanager/src/tool-box.c
2007-03-19 07:20:11 UTC (rev 1404)
@@ -97,6 +97,8 @@
g_thread_create (package_list_execute_change, data, TRUE, NULL);
gtk_dialog_run (GTK_DIALOG (installdialog));
gtk_widget_destroy (GTK_WIDGET (installdialog));
+
+ filter_menu_show_install_list (MOKO_APPLICATION_MANAGER_DATA (data));
}
gtk_widget_destroy (dialog);
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
