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. r1694 - trunk/oe/packages/openmoko-pim/files
([EMAIL PROTECTED])
2. r1695 - trunk/oe/packages/openmoko-base/files
([EMAIL PROTECTED])
3. r1696 -
trunk/src/target/OM-2007/applications/openmoko-appmanager
([EMAIL PROTECTED])
4. r1697 -
trunk/src/target/OM-2007/applications/openmoko-rssreader/src
([EMAIL PROTECTED])
5. r1698 - in
trunk/src/target/OM-2007/applications/openmoko-rssreader: . tests
([EMAIL PROTECTED])
6. r1699 - in
trunk/src/target/OM-2007/applications/openmoko-rssreader: . data
po src tests ([EMAIL PROTECTED])
7. r1700 -
trunk/src/target/OM-2007/applications/openmoko-appmanager/src
([EMAIL PROTECTED])
--- Begin Message ---
Author: mickey
Date: 2007-04-07 19:56:53 +0200 (Sat, 07 Apr 2007)
New Revision: 1694
Added:
trunk/oe/packages/openmoko-pim/files/openmoko-dates.png
Removed:
trunk/oe/packages/openmoko-pim/files/Dates.png
Log:
oe: catch up with icon rename
Deleted: trunk/oe/packages/openmoko-pim/files/Dates.png
===================================================================
(Binary files differ)
Copied: trunk/oe/packages/openmoko-pim/files/openmoko-dates.png (from rev 1691,
trunk/oe/packages/openmoko-pim/files/Dates.png)
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-04-07 19:59:23 +0200 (Sat, 07 Apr 2007)
New Revision: 1695
Modified:
trunk/oe/packages/openmoko-base/files/session
Log:
openmoko-session: launch all applets
Modified: trunk/oe/packages/openmoko-base/files/session
===================================================================
--- trunk/oe/packages/openmoko-base/files/session 2007-04-07 17:56:53 UTC
(rev 1694)
+++ trunk/oe/packages/openmoko-base/files/session 2007-04-07 17:59:23 UTC
(rev 1695)
@@ -8,9 +8,10 @@
--titlefont sans-20:bold \
--bg
img-tiled:/usr/share/themes/openmoko-standard/gtk-2.0/mokopanedwindow-upper-enclosing.png
&
+
matchbox-panel \
--start-applets=openmoko-panel-mainmenu,systray \
- --end-applets=openmoko-panel-battery,openmoko-panel-clock,openmoko-panel-gsm
&
+
--end-applets=openmoko-panel-battery,openmoko-panel-gsm,openmoko-panel-gps,openmoko-panel-usb,openmoko-panel-bt,openmoko-panel-clock
&
# start some old-style panel plugins to get a keyboard and startup notification
mbinputmgr &
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-04-07 20:43:27 +0200 (Sat, 07 Apr 2007)
New Revision: 1696
Removed:
trunk/src/target/OM-2007/applications/openmoko-appmanager/is-processing.patch
Log:
openmoko-appmanager: remove is-processing patch from here, it's now in
oe/packages/ipkg
Deleted:
trunk/src/target/OM-2007/applications/openmoko-appmanager/is-processing.patch
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-appmanager/is-processing.patch
2007-04-07 17:59:23 UTC (rev 1695)
+++
trunk/src/target/OM-2007/applications/openmoko-appmanager/is-processing.patch
2007-04-07 18:43:27 UTC (rev 1696)
@@ -1,178 +0,0 @@
-diff -Nur ipkg-0.99.163.orig/ipkg_install.c ipkg-0.99.163/ipkg_install.c
---- ipkg-0.99.163.orig/ipkg_install.c 2006-03-30 21:50:24.000000000 +0800
-+++ ipkg-0.99.163/ipkg_install.c 2007-03-15 08:01:20.000000000 +0800
-@@ -211,6 +211,7 @@
- anyone ever wants to make a nice libipkg. */
-
- ipkg_message(conf, IPKG_DEBUG2,"Function: %s calling ipkg_install_pkg
\n",__FUNCTION__);
-+ new->is_processing = 1;
- return ipkg_install_pkg(conf, new,0);
- }
-
-diff -Nur ipkg-0.99.163.orig/libbb/unzip.c ipkg-0.99.163/libbb/unzip.c
---- ipkg-0.99.163.orig/libbb/unzip.c 2006-02-06 16:13:02.000000000 +0800
-+++ ipkg-0.99.163/libbb/unzip.c 2007-03-15 08:03:45.000000000 +0800
-@@ -1028,13 +1028,15 @@
- */
- extern void gz_close(int gunzip_pid)
- {
-- if (kill(gunzip_pid, SIGTERM) == -1) {
-- error_msg_and_die("*** Couldnt kill old gunzip process ***
aborting");
-- }
-+ if (kill(gunzip_pid, 0) == 0) {
-+ if (kill(gunzip_pid, SIGTERM) == -1) {
-+ error_msg_and_die("*** Couldnt kill old gunzip process
*** aborting");
-+ }
-
-- if (waitpid(gunzip_pid, NULL, 0) == -1) {
-- printf("Couldnt wait ?");
-+ if (waitpid(gunzip_pid, NULL, 0) == -1) {
-+ printf("Couldnt wait ?");
-+ }
- }
-- free(window);
-- free(crc_table);
-+ free(window);
-+ free(crc_table);
- }
-diff -Nur ipkg-0.99.163.orig/pkg.c ipkg-0.99.163/pkg.c
---- ipkg-0.99.163.orig/pkg.c 2006-04-21 04:29:28.000000000 +0800
-+++ ipkg-0.99.163/pkg.c 2007-03-20 15:11:32.845064480 +0800
-@@ -33,6 +33,7 @@
- #include "xsystem.h"
- #include "ipkg_conf.h"
-
-+
- typedef struct enum_map enum_map_t;
- struct enum_map
- {
-@@ -522,6 +523,10 @@
- strncat(buff ,line, strlen(line));
- free(line);
-
-+ line = pkg_formatted_field(pkg, "Installed-Size");
-+ strncat(buff ,line, strlen(line));
-+ free(line);
-+
- return buff;
- }
-
-@@ -542,7 +547,6 @@
- }
-
- temp[0]='\0';
--
- switch (field[0])
- {
- case 'a':
-@@ -690,13 +694,42 @@
- case 'I': {
- if (strcasecmp(field, "Installed-Size") == 0) {
- /* Installed-Size */
-- temp = (char *)realloc(temp,strlen(pkg->installed_size)+17);
-- if ( temp == NULL ){
-- fprintf(stderr, "%s: out of memory\n", __FUNCTION__);
-- return NULL;
-- }
-- temp[0]='\0';
-- snprintf(temp, (strlen(pkg->installed_size)+17),
"Installed-Size: %s\n", pkg->installed_size);
-+ if (pkg->installed_size) {
-+ temp = (char *)realloc(temp,strlen(pkg->installed_size)+18);
-+ if ( temp == NULL ){
-+ fprintf(stderr, "%s: out of memory\n", __FUNCTION__);
-+ return NULL;
-+ }
-+ temp[0]='\0';
-+ snprintf(temp, (strlen(pkg->installed_size)+18),
"Installed-Size: %s\n", pkg->installed_size);
-+ } else {
-+ /* Caculate installed files size */
-+ str_list_elt_t *iter;
-+ struct stat buf;
-+ int installed_files_length = 0;
-+ if (pkg->installed_files == NULL)
-+ break;
-+
-+ if (pkg->is_processing!=1)
-+ break;
-+
-+ for (iter = pkg->installed_files->head; iter; iter =
iter->next) {
-+ memset(&buf, 0, sizeof(struct stat));
-+ stat(iter->data, &buf);
-+ if (S_ISREG(buf.st_mode))
-+ installed_files_length += buf.st_size;
-+ }
-+ /*printf("installed_files_length:%d\n",
installed_files_length);*/
-+
-+ sprintf_alloc(&pkg->installed_size, "%d",
installed_files_length);
-+ temp = (char *)realloc(temp,strlen(pkg->installed_size)+18);
-+ if ( temp == NULL ){
-+ fprintf(stderr, "%s: out of memory\n", __FUNCTION__);
-+ return NULL;
-+ }
-+ temp[0]='\0';
-+ snprintf(temp, (strlen(pkg->installed_size)+18),
"Installed-Size: %s\n", pkg->installed_size);
-+ }
- } else if (strcasecmp(field, "Installed-Time") == 0 &&
pkg->installed_time) {
- temp = (char *)realloc(temp,29);
- if ( temp == NULL ){
-@@ -720,7 +753,7 @@
- return NULL;
- }
- temp[0]='\0';
-- snprintf(temp, (strlen(pkg->maintainer)+14), "maintainer:
%s\n", pkg->maintainer);
-+ snprintf(temp, (strlen(pkg->maintainer)+14), "Maintainer:
%s\n", pkg->maintainer);
- }
- } else if (strcasecmp(field, "MD5sum") == 0) {
- /* MD5sum */
-@@ -871,6 +904,24 @@
- }
- temp[0]='\0';
- snprintf(temp, (strlen(pkg->size)+8), "Size: %s\n",
pkg->size);
-+ } else {
-+ if ( pkg->local_filename ) {
-+ struct stat buf;
-+ memset(&buf, 0, sizeof(struct stat));
-+
-+ if ( stat(pkg->local_filename, &buf) == 0 ) {
-+
-+ sprintf_alloc(&pkg->size, "%d", buf.st_size);
-+ temp = (char *)realloc(temp, strlen(pkg->size)+8);
-+ if ( temp == NULL ){
-+ fprintf(stderr, "%s: out of memory\n",
__FUNCTION__);
-+ return NULL;
-+ }
-+ temp[0]='\0';
-+ snprintf(temp, (strlen(pkg->size)+8), "Size: %s\n",
pkg->size);
-+ }
-+ }
-+
- }
- } else if (strcasecmp(field, "Source") == 0) {
- /* Source */
-@@ -1016,6 +1067,12 @@
- pkg_print_field(pkg, file, "Essential"); /* @@@@ should be removed in
future release. */
- pkg_print_field(pkg, file, "Architecture");
- pkg_print_field(pkg, file, "Conffiles");
-+ pkg_print_field(pkg, file, "Description");
-+ pkg_print_field(pkg, file, "Maintainer");
-+ pkg_print_field(pkg, file, "Section");
-+ pkg_print_field(pkg, file, "Size");
-+ pkg_print_field(pkg, file, "Filename");
-+ pkg_print_field(pkg, file, "Installed-Size");
- pkg_print_field(pkg, file, "Installed-Time");
- fputs("\n", file);
- }
-diff -Nur ipkg-0.99.163.orig/pkg.h ipkg-0.99.163/pkg.h
---- ipkg-0.99.163.orig/pkg.h 2006-05-30 16:31:08.000000000 +0800
-+++ ipkg-0.99.163/pkg.h 2007-03-15 08:01:20.000000000 +0800
-@@ -176,6 +176,10 @@
- int arch_priority;
- /* Adding this flag, to "force" ipkg to choose a "provided_by_hand" package,
if there are multiple choice */
- int provided_by_hand;
-+
-+ /* Check whether this pkg is being removed or installed */
-+ int is_processing;
-+
- };
-
- pkg_t *pkg_new(void);
--- End Message ---
--- Begin Message ---
Author: zecke
Date: 2007-04-07 20:58:58 +0200 (Sat, 07 Apr 2007)
New Revision: 1697
Modified:
trunk/src/target/OM-2007/applications/openmoko-rssreader/src/rfcdate.c
trunk/src/target/OM-2007/applications/openmoko-rssreader/src/rfcdate.h
Log:
openmoko-rssreader: Minor change add void as parameter (C++->C is hard)
Modified: trunk/src/target/OM-2007/applications/openmoko-rssreader/src/rfcdate.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-rssreader/src/rfcdate.c
2007-04-07 18:43:27 UTC (rev 1696)
+++ trunk/src/target/OM-2007/applications/openmoko-rssreader/src/rfcdate.c
2007-04-07 18:58:58 UTC (rev 1697)
@@ -144,7 +144,7 @@
}
GObject*
-rss_rfc_date_new ()
+rss_rfc_date_new (void)
{
return G_OBJECT(g_object_new(RSS_TYPE_RFC_DATE, NULL));
}
Modified: trunk/src/target/OM-2007/applications/openmoko-rssreader/src/rfcdate.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-rssreader/src/rfcdate.h
2007-04-07 18:43:27 UTC (rev 1696)
+++ trunk/src/target/OM-2007/applications/openmoko-rssreader/src/rfcdate.h
2007-04-07 18:58:58 UTC (rev 1697)
@@ -28,8 +28,8 @@
GObjectClass parent;
};
-GType rss_rfc_date_get_type ();
-GObject* rss_rfc_date_new ();
+GType rss_rfc_date_get_type (void);
+GObject* rss_rfc_date_new (void);
void rss_rfc_date_set (RSSRFCDate* self, const gchar* rfc822_date);
gint rss_rfc_date_compare (RSSRFCDate* self, RSSRFCDate *other);
gchar* rss_rfc_date_as_string(RSSRFCDate* self);
--- End Message ---
--- Begin Message ---
Author: zecke
Date: 2007-04-07 21:00:58 +0200 (Sat, 07 Apr 2007)
New Revision: 1698
Added:
trunk/src/target/OM-2007/applications/openmoko-rssreader/tests/
trunk/src/target/OM-2007/applications/openmoko-rssreader/tests/Makefile.am
trunk/src/target/OM-2007/applications/openmoko-rssreader/tests/date_test.c
Modified:
trunk/src/target/OM-2007/applications/openmoko-rssreader/Makefile.am
trunk/src/target/OM-2007/applications/openmoko-rssreader/configure.ac
Log:
openmoko-rssreader: Start adding unit-tests for the non gui bits
Start adding unit tests for the RSS RFC Date class. This mostly
sets up autofoo to easily add new tests.
Modified: trunk/src/target/OM-2007/applications/openmoko-rssreader/Makefile.am
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-rssreader/Makefile.am
2007-04-07 18:58:58 UTC (rev 1697)
+++ trunk/src/target/OM-2007/applications/openmoko-rssreader/Makefile.am
2007-04-07 19:00:58 UTC (rev 1698)
@@ -1,2 +1,2 @@
-SUBDIRS = src data po
+SUBDIRS = src tests data po
Modified: trunk/src/target/OM-2007/applications/openmoko-rssreader/configure.ac
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-rssreader/configure.ac
2007-04-07 18:58:58 UTC (rev 1697)
+++ trunk/src/target/OM-2007/applications/openmoko-rssreader/configure.ac
2007-04-07 19:00:58 UTC (rev 1698)
@@ -14,7 +14,28 @@
AC_SUBST(GETTEXT_PACKAGE)
AM_GLIB_GNU_GETTEXT
+# unit testing (inspired by opensync)
+# enable gcov profiling
+GCOV_CPPFLAGS=""
+GCOV_LDFLAGS=""
+AC_ARG_ENABLE([profiling],
+ [AS_HELP_STRING([--enable-profiling], [enable gcov profiling])],
+ [case "${enableval}" in
+ yes) GCOV_PROFILING="yes"
+ GCOV_CPPFLAGS="-ftest-coverage -fprofile-arcs"
+ GCOV_LDFLAGS="-lgcov"
+ ;;
+ no) ;;
+ *) AC_MSG_ERROR([bad value ${enableval} for --enable-profiling]) ;;
+ esac],[GCOV_PROFILING="no"])
+AC_SUBST(GCOV_CPPFLAGS)
+AC_SUBST(GCOV_LDFLAGS)
+AM_CONDITIONAL(ENABLE_PROFILING, test "x${GCOV_PROFILING}" = "xyes")
+#check for check
+AM_PATH_CHECK([0.9.2], [ENABLE_TESTING="yes"], [ENABLE_TESTING="no"])
+AM_CONDITIONAL(ENABLE_TESTING, test "x${ENABLE_TESTING}" = "xyes")
+
# base deps
PKG_CHECK_MODULES(OPENMOKO, openmoko-libs >= 0.0.1)
PKG_CHECK_MODULES(MRSS, mrss >= 0.17 )
@@ -25,5 +46,6 @@
Makefile
src/Makefile
data/Makefile
+tests/Makefile
po/Makefile.in
])
Added:
trunk/src/target/OM-2007/applications/openmoko-rssreader/tests/Makefile.am
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-rssreader/tests/Makefile.am
2007-04-07 18:58:58 UTC (rev 1697)
+++ trunk/src/target/OM-2007/applications/openmoko-rssreader/tests/Makefile.am
2007-04-07 19:00:58 UTC (rev 1698)
@@ -0,0 +1,12 @@
+AM_CFLAGS = -Wall -Werror -std=c99 @OPENMOKO_CFLAGS@ @MRSS_CFLAGS@
@GCOV_CPPFLAGS@
+INCLUDES = -I$(top_srcdir)/src
+
+if ENABLE_TESTING
+TESTS = datetest
+check_PROGRAMS = datetest
+endif
+
+datatest_INCLUDES = @CHECK_CFLAGS@
+datetest_SOURCES = date_test.c ../src/rfcdate.c
+datetest_LIBS = @CHECK_LIBS@
+datetest_LDFLAGS = -lcheck @GCOV_LDFLAGS@ @OPENMOKO_LIBS@
Added:
trunk/src/target/OM-2007/applications/openmoko-rssreader/tests/date_test.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-rssreader/tests/date_test.c
2007-04-07 18:58:58 UTC (rev 1697)
+++ trunk/src/target/OM-2007/applications/openmoko-rssreader/tests/date_test.c
2007-04-07 19:00:58 UTC (rev 1698)
@@ -0,0 +1,50 @@
+#include <check.h>
+#include <stdlib.h>
+
+#include <glib.h>
+#include "rfcdate.h"
+
+START_TEST (test_create_date)
+{
+ RSSRFCDate *date = RSS_RFC_DATE(rss_rfc_date_new ());
+ g_object_unref( G_OBJECT(date) );
+}
+END_TEST
+
+START_TEST (test_parsing_date)
+{
+ RSSRFCDate *date = RSS_RFC_DATE(rss_rfc_date_new ());
+
+ rss_rfc_date_set (date, "Wed, 26 Jan 83 07:57");
+ fail_unless (g_date_get_month (date->date) == G_DATE_JANUARY, "Seldom year
number, seldom time");
+ fail_unless (g_date_get_day (date->date) == 26, "Parsed my birthday");
+ fail_unless (g_date_get_year (date->date) == 1983, "Parsed my birthyear");
+ fail_unless (date->timeval.tv_sec == (8*60*60+57*60), "Parsed my birthtime
properly");
+}
+END_TEST
+
+Suite*
+date_suite (void)
+{
+ Suite *s = suite_create( "Date" );
+ TCase *tc_core = tcase_create ("Core");
+ tcase_add_test (tc_core, test_create_date);
+ tcase_add_test (tc_core, test_parsing_date);
+ suite_add_tcase (s, tc_core);
+
+
+ return s;
+}
+
+int
+main (void)
+{
+ g_type_init ();
+ Suite *s = date_suite ();
+ SRunner *sr = srunner_create (s);
+ srunner_run_all (sr, CK_NORMAL);
+ int number_failed = srunner_ntests_failed (sr);
+ srunner_free (sr);
+
+ return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+}
--- End Message ---
--- Begin Message ---
Author: zecke
Date: 2007-04-07 21:09:51 +0200 (Sat, 07 Apr 2007)
New Revision: 1699
Modified:
trunk/src/target/OM-2007/applications/openmoko-rssreader/
trunk/src/target/OM-2007/applications/openmoko-rssreader/data/
trunk/src/target/OM-2007/applications/openmoko-rssreader/po/
trunk/src/target/OM-2007/applications/openmoko-rssreader/src/
trunk/src/target/OM-2007/applications/openmoko-rssreader/tests/
Log:
openmoko-rssreader: Ignore autogenerated files
Property changes on: trunk/src/target/OM-2007/applications/openmoko-rssreader
___________________________________________________________________
Name: svn:ignore
- Makefile.in
Makefile
*.bz2
mkinstalldirs
configure
depcomp
config.guess
ltmain.sh
config.sub
config.h.in
missing
aclocal.m4
install-sh
+ *.swp
stamp-h1
libtool
aclocal.m4
Makefile.in
Makefile
*.bz2
mkinstalldirs
configure
ltmain.sh
config.guess
config.sub
config.h.in
config.h
config.log
config.status
depcomp
missing
install-sh
autom4te.cache
*autogen_bak
INSTALL
config.status
Property changes on:
trunk/src/target/OM-2007/applications/openmoko-rssreader/data
___________________________________________________________________
Name: svn:ignore
+ Makefile
Makefile.in
Property changes on: trunk/src/target/OM-2007/applications/openmoko-rssreader/po
___________________________________________________________________
Name: svn:ignore
+ Makefile
Makefile.in
Makefile.in.in
POTFILES
*.pot
Property changes on:
trunk/src/target/OM-2007/applications/openmoko-rssreader/src
___________________________________________________________________
Name: svn:ignore
- *.*swp
*.swp
Makefile.in
Makefile
+ *.*swp
*.swp
Makefile.in
Makefile
.libs
.deps
openmoko-rssreader
Property changes on:
trunk/src/target/OM-2007/applications/openmoko-rssreader/tests
___________________________________________________________________
Name: svn:ignore
+ Makefile
Makefile.in
.deps
.libs
datetest
*.swp
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-04-07 21:22:36 +0200 (Sat, 07 Apr 2007)
New Revision: 1700
Modified:
trunk/src/target/OM-2007/applications/openmoko-appmanager/src/application-menu.c
trunk/src/target/OM-2007/applications/openmoko-appmanager/src/appmanager-window.c
Log:
openmoko-appmanager: set UI-visible application name, fix some typos
Modified:
trunk/src/target/OM-2007/applications/openmoko-appmanager/src/application-menu.c
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-appmanager/src/application-menu.c
2007-04-07 19:09:51 UTC (rev 1699)
+++
trunk/src/target/OM-2007/applications/openmoko-appmanager/src/application-menu.c
2007-04-07 19:22:36 UTC (rev 1700)
@@ -37,7 +37,7 @@
/*
* @brief The Callback function of the show status menu
*/
-void
+void
on_showstatus_activate (GtkMenuItem *menuitem, gpointer user_data)
{
g_debug ("Call on_showstatus_activate");
@@ -47,7 +47,7 @@
/*
* @brief The Callback function of the show source menu
*/
-void
+void
on_showsource_activate (GtkMenuItem *menuitem, gpointer user_data)
{
g_debug ("Call on_showsource_activate");
@@ -56,7 +56,7 @@
/*
* @brief The Callback function of the install single application menu
*/
-void
+void
on_install_single_application_activate (GtkMenuItem *menuitem, gpointer
user_data)
{
ApplicationManagerData *appdata;
@@ -78,7 +78,7 @@
if (!package_list_check_marked_list_empty (appdata))
{
- confirmdialog = gtk_message_dialog_new (NULL,
+ confirmdialog = gtk_message_dialog_new (NULL,
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_QUESTION,
GTK_BUTTONS_YES_NO,
@@ -114,7 +114,7 @@
res = gtk_dialog_run(GTK_DIALOG(filechooser));
errcode = USER_CANCEL;
- if( (res == GTK_RESPONSE_ACCEPT) || (res == GTK_RESPONSE_OK) )
+ if( (res == GTK_RESPONSE_ACCEPT) || (res == GTK_RESPONSE_OK) )
{
filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(filechooser));
@@ -201,7 +201,7 @@
/*
* @brief The Callback function of the show help menu
*/
-void
+void
on_showhelp_activate (GtkMenuItem *menuitem, gpointer user_data)
{
g_debug ("Call on_showhelp_activate");
@@ -210,7 +210,7 @@
/*
* @brief The Callback function of the quit menu
*/
-void
+void
on_quit_activate (GtkMenuItem *menuitem, gpointer user_data)
{
g_debug ("Call on_quit_activate");
@@ -220,7 +220,7 @@
/*
* @brief Create a new application menu for the application manager
* @param appdata The application manager data
- * @return The GtkMenu widget. If there is error,
+ * @return The GtkMenu widget. If there is error,
* it will return NULL.
*/
GtkMenu *
@@ -238,13 +238,13 @@
appmenu = GTK_MENU (gtk_menu_new ());
- showstatus = gtk_menu_item_new_with_mnemonic (_("Shows tatus"));
+ showstatus = gtk_menu_item_new_with_mnemonic (_("Show Status"));
gtk_widget_show (showstatus);
gtk_container_add (GTK_CONTAINER (appmenu), showstatus);
g_signal_connect ((gpointer) showstatus, "activate",
G_CALLBACK (on_showstatus_activate), appdata);
- showsource = gtk_menu_item_new_with_mnemonic (_("Show source"));
+ showsource = gtk_menu_item_new_with_mnemonic (_("Show Source"));
gtk_widget_show (showsource);
gtk_container_add (GTK_CONTAINER (appmenu), showsource);
g_signal_connect ((gpointer) showsource, "activate",
@@ -256,7 +256,7 @@
g_signal_connect ((gpointer) installsingleapp, "activate",
G_CALLBACK (on_install_single_application_activate),
appdata);
- showhelp = gtk_menu_item_new_with_mnemonic (_("Show help"));
+ showhelp = gtk_menu_item_new_with_mnemonic (_("Show Help"));
gtk_widget_show (showhelp);
gtk_container_add (GTK_CONTAINER (appmenu), showhelp);
g_signal_connect ((gpointer) showhelp, "activate",
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-04-07 19:09:51 UTC (rev 1699)
+++
trunk/src/target/OM-2007/applications/openmoko-appmanager/src/appmanager-window.c
2007-04-07 19:22:36 UTC (rev 1700)
@@ -37,7 +37,7 @@
/*
* @brief The start function.
*/
-int
+int
main (int argc, char* argv[])
{
ApplicationManagerData *appdata;
@@ -53,9 +53,10 @@
gint ret;
- g_debug ("appplication manager start up");
+ g_debug ("application manager start up");
gtk_init (&argc, &argv);
+ g_set_application_name( _("Application Manager") );
if (argc != 1)
{
@@ -72,7 +73,7 @@
init_pixbuf_list (appdata);
window = MOKO_PANED_WINDOW (moko_paned_window_new ());
- g_signal_connect (G_OBJECT (window), "delete_event",
+ g_signal_connect (G_OBJECT (window), "delete_event",
G_CALLBACK (gtk_main_quit), NULL);
application_manager_data_set_main_window (appdata, window);
@@ -104,13 +105,13 @@
ret = init_package_list (appdata);
if (ret != OP_SUCCESS)
{
- g_debug ("Can not initial the libipkg, the result is%d", ret);
+ g_debug ("Can not initialize libipkg, result was %d, aborting.", ret);
return -1;
}
ret = package_list_build_index (appdata);
if (ret != OP_SUCCESS)
{
- g_debug ("Can not build index for packages");
+ g_debug ("Can not build index for packages, aborting.");
return -1;
}
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
