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. r4234 - trunk/src/target/opkg/libopkg ([EMAIL PROTECTED])
2. r4235 - in trunk/src/target/opkg: . libopkg
([EMAIL PROTECTED])
3. r4236 - in
trunk/src/target/OM-2007.2/applications/openmoko-dialer2: .
src/dialer ([EMAIL PROTECTED])
4. r4237 -
trunk/src/target/OM-2007.2/applications/openmoko-dialer2
([EMAIL PROTECTED])
5. r4238 - trunk/src/target/opkg/libopkg ([EMAIL PROTECTED])
6. r4239 - in
trunk/src/target/OM-2007.2/applications/openmoko-dialer2: .
src/dialer ([EMAIL PROTECTED])
7. r4240 -
trunk/src/target/OM-2007.2/applications/openmoko-dialer2
([EMAIL PROTECTED])
8. r4241 -
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer
([EMAIL PROTECTED])
--- Begin Message ---
Author: thomas
Date: 2008-03-20 13:07:09 +0100 (Thu, 20 Mar 2008)
New Revision: 4234
Modified:
trunk/src/target/opkg/libopkg/opkg_configure.c
trunk/src/target/opkg/libopkg/opkg_download.c
trunk/src/target/opkg/libopkg/opkg_remove.c
Log:
opkg: remove some printfs and replace with opkg_message where appropriate
Modified: trunk/src/target/opkg/libopkg/opkg_configure.c
===================================================================
--- trunk/src/target/opkg/libopkg/opkg_configure.c 2008-03-20 10:43:09 UTC
(rev 4233)
+++ trunk/src/target/opkg/libopkg/opkg_configure.c 2008-03-20 12:07:09 UTC
(rev 4234)
@@ -37,7 +37,7 @@
err = pkg_run_script(conf, pkg, "postinst", "configure");
if (err) {
- printf("ERROR: %s.postinst returned %d\n", pkg->name, err);
+ opkg_message(conf, OPKG_ERROR, "ERROR: %s.postinst returned %d\n",
pkg->name, err);
return err;
}
Modified: trunk/src/target/opkg/libopkg/opkg_download.c
===================================================================
--- trunk/src/target/opkg/libopkg/opkg_download.c 2008-03-20 10:43:09 UTC
(rev 4233)
+++ trunk/src/target/opkg/libopkg/opkg_download.c 2008-03-20 12:07:09 UTC
(rev 4234)
@@ -182,7 +182,9 @@
else
return -1;
- printf ("\n");
+ /* if no custom progress handler was set, we need to clear the default
progress bar */
+ if (!opkg_cb_download_progress)
+ printf ("\n");
err = file_move(tmp_file_location, dest_file_name);
Modified: trunk/src/target/opkg/libopkg/opkg_remove.c
===================================================================
--- trunk/src/target/opkg/libopkg/opkg_remove.c 2008-03-20 10:43:09 UTC (rev
4233)
+++ trunk/src/target/opkg/libopkg/opkg_remove.c 2008-03-20 12:07:09 UTC (rev
4234)
@@ -204,11 +204,13 @@
deps = pkg_has_installed_dependents(conf, NULL, p, &dependents);
if (deps == 0)
{
- printf ("%s was autoinstalled but is now orphaned\n", buffer);
+ opkg_message (conf, OPKG_INFO,
+ "%s was autoinstalled but is now orphaned\n", buffer);
opkg_remove_pkg(conf, p,0);
}
else
- printf ("%s was autoinstalled and is still required by %d installed
packages\n", buffer, deps);
+ opkg_message (conf, OPKG_INFO, "%s was autoinstalled and is still
required by "
+ "%d installed packages\n", buffer, deps);
}
free (buffer);
}
@@ -272,7 +274,8 @@
}
if ( message==0 ){
- printf("Removing package %s from %s...\n", pkg->name,
pkg->dest->name);
+ opkg_message (conf, OPKG_NOTICE,
+ "Removing package %s from %s...\n", pkg->name,
pkg->dest->name);
fflush(stdout);
}
pkg->state_flag |= SF_FILELIST_CHANGED;
@@ -349,7 +352,8 @@
this seems like a better thing to do to conserve
space. */
if (conffile_has_been_modified(conf, conffile)) {
- printf(" not deleting modified conffile %s\n", file_name);
+ opkg_message (conf, OPKG_NOTICE,
+ " not deleting modified conffile %s\n",
file_name);
fflush(stdout);
continue;
}
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2008-03-20 13:17:42 +0100 (Thu, 20 Mar 2008)
New Revision: 4235
Modified:
trunk/src/target/opkg/configure.ac
trunk/src/target/opkg/libopkg/Makefile.am
Log:
opkg: Fix md5 sum on big endian systems.
Patch from Jeremy Lain?\195?\169 <jeremy laine bolloretelecom eu>
Modified: trunk/src/target/opkg/configure.ac
===================================================================
--- trunk/src/target/opkg/configure.ac 2008-03-20 12:07:09 UTC (rev 4234)
+++ trunk/src/target/opkg/configure.ac 2008-03-20 12:17:42 UTC (rev 4235)
@@ -93,6 +93,10 @@
AC_TYPE_SIZE_T
AC_CHECK_MEMBERS([struct stat.st_rdev])
+# Checks endianness
+AC_C_BIGENDIAN(ENDIAN_CFLAGS="-DWORDS_BIGENDIAN=1",)
+AC_SUBST(BIGENDIAN_CFLAGS)
+
# Don't do annoying tests that don't work when cross-compiling, just trust
them.
# The AC_FUNC_MEMCMP test doesn't work during a cross-compile, disable.
# AC_FUNC_MEMCMP
Modified: trunk/src/target/opkg/libopkg/Makefile.am
===================================================================
--- trunk/src/target/opkg/libopkg/Makefile.am 2008-03-20 12:07:09 UTC (rev
4234)
+++ trunk/src/target/opkg/libopkg/Makefile.am 2008-03-20 12:17:42 UTC (rev
4235)
@@ -59,7 +59,7 @@
$(opkg_cmd_sources) $(opkg_db_sources) \
$(opkg_util_sources) $(opkg_list_sources)
-libopkg_la_CFLAGS = $(ALL_CFLAGS) $(CURL_CFLAGS) $(GPGME_CFLAGS)
+libopkg_la_CFLAGS = $(ALL_CFLAGS) $(BIGENDIAN_CFLAGS) $(CURL_CFLAGS)
$(GPGME_CFLAGS)
lib_LTLIBRARIES = libopkg.la
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2008-03-20 16:08:05 +0100 (Thu, 20 Mar 2008)
New Revision: 4236
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/dialer-main.c
Log:
2008-03-20 Thomas Wood <[EMAIL PROTECTED]>
* src/dialer/dialer-main.c: (main): Set a widget name on the dial pad
for theming
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2008-03-20 12:17:42 UTC (rev 4235)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2008-03-20 15:08:05 UTC (rev 4236)
@@ -1,3 +1,8 @@
+2008-03-20 Thomas Wood <[EMAIL PROTECTED]>
+
+ * src/dialer/dialer-main.c: (main): Set a widget name on the dial pad
+ for theming
+
2008-03-19 Thomas Wood <[EMAIL PROTECTED]>
* src/dialer/moko-history.c: Add a "Save" button to the call log window
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/dialer-main.c
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/dialer-main.c
2008-03-20 12:17:42 UTC (rev 4235)
+++
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/dialer-main.c
2008-03-20 15:08:05 UTC (rev 4236)
@@ -141,6 +141,7 @@
/* Notebook */
data->notebook = gtk_notebook_new ();
+ gtk_widget_set_name (data->notebook, "openmoko-dialer-notebook");
gtk_notebook_set_tab_pos (GTK_NOTEBOOK (data->notebook), GTK_POS_BOTTOM);
gtk_container_add (GTK_CONTAINER (window), data->notebook);
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2008-03-20 16:13:58 +0100 (Thu, 20 Mar 2008)
New Revision: 4237
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/
Log:
openmoko-dialer: bring in libhito
Property changes on: trunk/src/target/OM-2007.2/applications/openmoko-dialer2
___________________________________________________________________
Name: svn:externals
+ libhito https://svn.o-hand.com/repos/contacts/branches/hito/libhito
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2008-03-20 16:21:30 +0100 (Thu, 20 Mar 2008)
New Revision: 4238
Modified:
trunk/src/target/opkg/libopkg/opkg.h
trunk/src/target/opkg/libopkg/opkg_download.c
Log:
opkg: remove some "#if 0" code
Modified: trunk/src/target/opkg/libopkg/opkg.h
===================================================================
--- trunk/src/target/opkg/libopkg/opkg.h 2008-03-20 15:13:58 UTC (rev
4237)
+++ trunk/src/target/opkg/libopkg/opkg.h 2008-03-20 15:21:30 UTC (rev
4238)
@@ -22,10 +22,6 @@
#include "config.h"
#endif
-#if 0
-#define OPKG_DEBUG_NO_TMP_CLEANUP
-#endif
-
#include "includes.h"
#include "opkg_conf.h"
#include "opkg_message.h"
Modified: trunk/src/target/opkg/libopkg/opkg_download.c
===================================================================
--- trunk/src/target/opkg/libopkg/opkg_download.c 2008-03-20 15:13:58 UTC
(rev 4237)
+++ trunk/src/target/opkg/libopkg/opkg_download.c 2008-03-20 15:21:30 UTC
(rev 4238)
@@ -121,31 +121,6 @@
setenv("no_proxy", conf->no_proxy, 1);
}
- /* XXX: BUG rewrite to use execvp or else busybox's internal wget -Jamey
7/23/2002 */
-#if 0
- sprintf_alloc(&cmd, "wget --passive-ftp %s %s%s %s%s %s -P %s %s",
- (conf->http_proxy || conf->ftp_proxy) ? "--proxy=on" : "",
- conf->proxy_user ? "--proxy-user=" : "",
- conf->proxy_user ? conf->proxy_user : "",
- conf->proxy_passwd ? "--proxy-passwd=" : "",
- conf->proxy_passwd ? conf->proxy_passwd : "",
- conf->verbose_wget ? "" : "-q",
- conf->tmp_dir,
- src);
- err = xsystem(cmd);
- if (err) {
- if (err != -1) {
- opkg_message(conf,OPKG_ERROR, "%s: ERROR: Command failed with
return value %d: `%s'\n",
- __FUNCTION__, err, cmd);
- }
- unlink(tmp_file_location);
- free(tmp_file_location);
- free(src_basec);
- free(cmd);
- return EINVAL;
- }
- free(cmd);
-#endif
CURL *curl;
CURLcode res;
FILE * file = fopen (tmp_file_location, "w");
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2008-03-20 18:06:43 +0100 (Thu, 20 Mar 2008)
New Revision: 4239
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/Makefile.am
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/configure.ac
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/Makefile.am
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/moko-history.c
Log:
2008-03-20 Thomas Wood <[EMAIL PROTECTED]>
* Makefile.am:
* configure.ac:
* src/dialer/Makefile.am:
* src/dialer/moko-history.c: (on_btn_save_clicked):
Display a list of contacts when "Add to contact" is clicked
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2008-03-20 15:21:30 UTC (rev 4238)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2008-03-20 17:06:43 UTC (rev 4239)
@@ -1,5 +1,14 @@
2008-03-20 Thomas Wood <[EMAIL PROTECTED]>
+ * Makefile.am:
+ * configure.ac:
+ * src/dialer/Makefile.am:
+ * src/dialer/moko-history.c: (on_btn_save_clicked):
+
+ Display a list of contacts when "Add to contact" is clicked
+
+2008-03-20 Thomas Wood <[EMAIL PROTECTED]>
+
* src/dialer/dialer-main.c: (main): Set a widget name on the dial pad
for theming
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/Makefile.am
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/Makefile.am
2008-03-20 15:21:30 UTC (rev 4238)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/Makefile.am
2008-03-20 17:06:43 UTC (rev 4239)
@@ -1,2 +1,2 @@
-SUBDIRS = src data
+SUBDIRS = libhito src data
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/configure.ac
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/configure.ac
2008-03-20 15:21:30 UTC (rev 4238)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/configure.ac
2008-03-20 17:06:43 UTC (rev 4239)
@@ -37,6 +37,21 @@
AC_SUBST(DIALER_CFLAGS)
AC_SUBST(DIALER_LIBS)
+
+# deps for libhito
+PKG_CHECK_MODULES(CONTACTS, glib-2.0 glib-2.0 gtk+-2.0 libebook-1.2)
+
+old_cflags=$CFLAGS
+CFLAGS=$CONTACTS_CFLAGS
+AC_CHECK_TYPE(EContactPhotoType, [], [], [#include <libebook/e-book.h>])
+CFLAGS=$old_cflags
+
+if test $ac_cv_type_EContactPhotoType = yes; then
+ AC_DEFINE(HAVE_PHOTO_TYPE, 1, [Defined if EContactPhotoType exists])
+fi
+
+
+
dnl ==============================================
dnl DBUS
dnl ==============================================
@@ -56,6 +71,7 @@
# output stuff
AC_OUTPUT([
Makefile
+libhito/Makefile
src/Makefile
src/common/Makefile
src/dialer/Makefile
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/Makefile.am
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/Makefile.am
2008-03-20 15:21:30 UTC (rev 4238)
+++
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/Makefile.am
2008-03-20 17:06:43 UTC (rev 4239)
@@ -1,7 +1,7 @@
AM_CPPFLAGS = -DDATADIR=\"$(datadir)\" -DPKGDATADIR=\"$(pkgdatadir)\"
AM_CFLAGS = -Wall @DIALER_CFLAGS@ @JANA_CFLAGS@
-INCLUDES = -I$(top_srcdir)/src/common
+INCLUDES = -I$(top_srcdir)/src/common -I$(top_srcdir)/libhito
bin_PROGRAMS = openmoko-dialer
@@ -11,4 +11,7 @@
moko-tips.c moko-tips.h \
dialer-main.c
-openmoko_dialer_LDADD = @DIALER_LIBS@ @JANA_LIBS@
$(top_srcdir)/src/common/libdialer-common.a
+openmoko_dialer_LDADD = @DIALER_LIBS@ @JANA_LIBS@ \
+ $(top_srcdir)/src/common/libdialer-common.a \
+ $(top_srcdir)/libhito/libhito.a
+
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/moko-history.c
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/moko-history.c
2008-03-20 15:21:30 UTC (rev 4238)
+++
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/moko-history.c
2008-03-20 17:06:43 UTC (rev 4239)
@@ -30,6 +30,11 @@
#include <moko-stock.h>
#include <moko-finger-scroll.h>
+#include <libebook/e-book.h>
+
+#include "hito-contact-view.h"
+#include "hito-contact-store.h"
+
#include "moko-contacts.h"
#include "moko-history.h"
@@ -226,7 +231,47 @@
if (action == 1)
{ /* create new contact */ }
else
- {/* add to contact */ }
+ {
+ EBook *book;
+ EBookQuery *query;
+ EBookView *view;
+ GtkWidget *window, *contacts_treeview, *scroll;
+ GtkTreeModel *store;
+ GError *err = NULL;
+
+ window = gtk_dialog_new_with_buttons ("Add to Contact", NULL, 0,
+ "Cancel", GTK_RESPONSE_CANCEL,
+ "Add", GTK_RESPONSE_OK,
+ NULL);
+
+ book = e_book_new_system_addressbook (&err);
+ if (err)
+ return;
+ e_book_open (book, FALSE, &err);
+ if (err)
+ return;
+ query = e_book_query_any_field_contains (NULL);
+ e_book_get_book_view (book, query, NULL, 0, &view, &err);
+ if (err)
+ return;
+
+ e_book_query_unref (query);
+ e_book_view_start (view);
+
+ store = hito_contact_store_new (view);
+ contacts_treeview = hito_contact_view_new (HITO_CONTACT_STORE (store),
NULL);
+
+ scroll = moko_finger_scroll_new ();
+ gtk_box_pack_start_defaults (GTK_BOX (GTK_DIALOG (window)->vbox), scroll);
+
+ gtk_container_add (GTK_CONTAINER (scroll), contacts_treeview);
+
+ gtk_widget_show_all (scroll);
+
+ gtk_dialog_run (GTK_DIALOG (window));
+ gtk_widget_destroy (window);
+ e_book_
+ }
g_free (number);
}
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2008-03-20 18:11:35 +0100 (Thu, 20 Mar 2008)
New Revision: 4240
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/
Log:
dialer: fix svn:externals
Property changes on: trunk/src/target/OM-2007.2/applications/openmoko-dialer2
___________________________________________________________________
Name: svn:externals
- libhito https://svn.o-hand.com/repos/contacts/branches/hito/libhito
+ libhito http://svn.o-hand.com/repos/contacts/branches/hito/libhito
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2008-03-20 18:30:04 +0100 (Thu, 20 Mar 2008)
New Revision: 4241
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/moko-history.c
Log:
dialer: fix typo
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/moko-history.c
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/moko-history.c
2008-03-20 17:11:35 UTC (rev 4240)
+++
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/moko-history.c
2008-03-20 17:30:04 UTC (rev 4241)
@@ -270,7 +270,6 @@
gtk_dialog_run (GTK_DIALOG (window));
gtk_widget_destroy (window);
- e_book_
}
g_free (number);
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
