Send commitlog mailing list submissions to
commitlog@lists.openmoko.org
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. r4172 - in
trunk/src/target/OM-2007.2/applications/openmoko-browser2: . src
([EMAIL PROTECTED])
2. r4173 -
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2
([EMAIL PROTECTED])
3. r4174 - in trunk/src/target/gsm: include/gsmd src/gsmd
src/libgsmd src/util ([EMAIL PROTECTED])
--- Begin Message ---
Author: zecke
Date: 2008-03-05 12:49:05 +0100 (Wed, 05 Mar 2008)
New Revision: 4172
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-browser2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-browser2/configure.ac
trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/browser-data.h
trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/current-page.c
trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/main.c
trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/open-pages-page.c
Log:
2008-03-05 Koen Kooi <[EMAIL PROTECTED]>
Keep track of the API changes.
* configure.ac:
* src/browser-data.h:
* src/current-page.c:
(current_back_clicked_closure):
(current_progress_changed):
(update_current_page_from_iter):
* src/main.c:
(main):
* src/open-pages-page.c:
Modified: trunk/src/target/OM-2007.2/applications/openmoko-browser2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-browser2/ChangeLog
2008-03-05 08:09:57 UTC (rev 4171)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/ChangeLog
2008-03-05 11:49:05 UTC (rev 4172)
@@ -1,3 +1,17 @@
+2008-03-05 Koen Kooi <[EMAIL PROTECTED]>
+
+ Keep track of the API changes.
+
+ * configure.ac:
+ * src/browser-data.h:
+ * src/current-page.c:
+ (current_back_clicked_closure):
+ (current_progress_changed):
+ (update_current_page_from_iter):
+ * src/main.c:
+ (main):
+ * src/open-pages-page.c:
+
2007-12-12 Holger Freyther <[EMAIL PROTECTED]>
Update to the recent API of WebKit/Gtk
Modified: trunk/src/target/OM-2007.2/applications/openmoko-browser2/configure.ac
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-browser2/configure.ac
2008-03-05 08:09:57 UTC (rev 4171)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/configure.ac
2008-03-05 11:49:05 UTC (rev 4172)
@@ -40,7 +40,7 @@
# base deps
PKG_CHECK_MODULES(OPENMOKO, libmokoui2 >= 0.1.0)
PKG_CHECK_MODULES(GTHREAD, gthread-2.0 )
-PKG_CHECK_MODULES(WEBKITGTK, WebKitGtk)
+PKG_CHECK_MODULES(WEBKITGTK, webkit-1.0)
# glib-genmarshal
GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/browser-data.h
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/browser-data.h
2008-03-05 08:09:57 UTC (rev 4171)
+++
trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/browser-data.h
2008-03-05 11:49:05 UTC (rev 4172)
@@ -27,7 +27,7 @@
#ifndef OPENMOKO_BROWSER_DATA_H
#define OPENMOKO_BROWSER_DATA_H
-#include "webkitwebview.h"
+#include <webkit/webkitwebview.h>
#include <glib.h>
#include <gtk/gtk.h>
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/current-page.c
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/current-page.c
2008-03-05 08:09:57 UTC (rev 4171)
+++
trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/current-page.c
2008-03-05 11:49:05 UTC (rev 4172)
@@ -28,8 +28,8 @@
#include "current-page.h"
#include <moko-finger-scroll.h>
-#include <webkitwebframe.h>
-#include <webkitwebview.h>
+#include <webkit/webkitwebframe.h>
+#include <webkit/webkitwebview.h>
/*
* From a list of BrowserPage's in BrowserData::currentPage show
@@ -42,7 +42,7 @@
static void current_back_clicked_closure(GtkWidget* button, struct
BrowserData* data)
{
g_return_if_fail (data->currentPage);
- webkit_web_view_go_backward(data->currentPage->webKitPage);
+ webkit_web_view_go_back(data->currentPage->webKitPage);
}
static void current_forward_clicked_closure(GtkWidget* button, struct
BrowserData* data)
@@ -66,7 +66,7 @@
g_assert (page == data->currentPage->webKitPage);
if (prog == 100) {
- gtk_widget_set_sensitive (GTK_WIDGET (data->currentBack),
webkit_web_view_can_go_backward (page));
+ gtk_widget_set_sensitive (GTK_WIDGET (data->currentBack),
webkit_web_view_can_go_back (page));
gtk_widget_set_sensitive (GTK_WIDGET (data->currentForward),
webkit_web_view_can_go_forward (page));
gtk_widget_set_sensitive (GTK_WIDGET (data->currentAdd),
webkit_web_frame_get_title (webkit_web_view_get_main_frame (page)) != NULL);
}
@@ -176,7 +176,7 @@
* Update the GtkToolItems
*/
/* XXX ### FIXME TODO check if we should show stop/reload */
- gtk_widget_set_sensitive (GTK_WIDGET (data->currentBack),
webkit_web_view_can_go_backward (data->currentPage->webKitPage));
+ gtk_widget_set_sensitive (GTK_WIDGET (data->currentBack),
webkit_web_view_can_go_back (data->currentPage->webKitPage));
gtk_widget_set_sensitive (GTK_WIDGET (data->currentForward),
webkit_web_view_can_go_forward (data->currentPage->webKitPage));
gtk_widget_set_sensitive (GTK_WIDGET (data->currentAdd),
webkit_web_frame_get_title (webkit_web_view_get_main_frame
(data->currentPage->webKitPage)) != NULL);
gtk_widget_set_sensitive (GTK_WIDGET (data->currentClose), TRUE);
Modified: trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/main.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/main.c
2008-03-05 08:09:57 UTC (rev 4171)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/main.c
2008-03-05 11:49:05 UTC (rev 4172)
@@ -33,7 +33,7 @@
#include <gtk/gtk.h>
#include <glib/gi18n.h>
-#include <webkit.h>
+#include <webkit/webkit.h>
#include <moko-finger-scroll.h>
#include <moko-stock.h>
@@ -55,7 +55,6 @@
gdk_threads_init ();
gdk_threads_enter ();
gtk_init (&argc, &argv);
- webkit_init ();
moko_stock_register ();
g_set_application_name (_("Browser"));
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/open-pages-page.c
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/open-pages-page.c
2008-03-05 08:09:57 UTC (rev 4171)
+++
trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/open-pages-page.c
2008-03-05 11:49:05 UTC (rev 4172)
@@ -28,8 +28,8 @@
#include "open-pages-page.h"
#include "current-page.h"
-#include <webkitwebframe.h>
-#include <webkitwebview.h>
+#include <webkit/webkitwebframe.h>
+#include <webkit/webkitwebview.h>
#include <moko-finger-scroll.h>
#include <glib/gi18n.h>
--- End Message ---
--- Begin Message ---
Author: graeme
Date: 2008-03-05 21:26:56 +0100 (Wed, 05 Mar 2008)
New Revision: 4173
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/configure.ac
Log:
Add an AC_LANG_CPLUSPLUS as we link with C++ libraries and therefore need
to use g++ as a linker
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/configure.ac
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/configure.ac
2008-03-05 11:49:05 UTC (rev 4172)
+++ trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/configure.ac
2008-03-05 20:26:56 UTC (rev 4173)
@@ -11,6 +11,7 @@
AC_STDC_HEADERS
AC_PROG_LIBTOOL
AC_PROG_INTLTOOL([0.35.0])
+AC_LANG_CPLUSPLUS
dnl i18n support
GETTEXT_PACKAGE=AC_PACKAGE_NAME
--- End Message ---
--- Begin Message ---
Author: erin_yueh
Date: 2008-03-06 10:35:12 +0100 (Thu, 06 Mar 2008)
New Revision: 4174
Modified:
trunk/src/target/gsm/include/gsmd/usock.h
trunk/src/target/gsm/src/gsmd/usock.c
trunk/src/target/gsm/src/libgsmd/libgsmd_phone.c
trunk/src/target/gsm/src/util/shell.c
Log:
gsmd: Query Antenna Status (Erin Yueh)
Modified: trunk/src/target/gsm/include/gsmd/usock.h
===================================================================
--- trunk/src/target/gsm/include/gsmd/usock.h 2008-03-05 20:26:56 UTC (rev
4173)
+++ trunk/src/target/gsm/include/gsmd/usock.h 2008-03-06 09:35:12 UTC (rev
4174)
@@ -142,6 +142,7 @@
GSMD_PHONE_GET_BATTERY = 8,
GSMD_PHONE_VIB_ENABLE = 9,
GSMD_PHONE_VIB_DISABLE = 10,
+ GSMD_PHONE_POWER_STATUS = 11,
};
enum gsmd_msg_modem {
Modified: trunk/src/target/gsm/src/gsmd/usock.c
===================================================================
--- trunk/src/target/gsm/src/gsmd/usock.c 2008-03-05 20:26:56 UTC (rev
4173)
+++ trunk/src/target/gsm/src/gsmd/usock.c 2008-03-06 09:35:12 UTC (rev
4174)
@@ -613,6 +613,15 @@
cmd->id, sizeof(ret), &ret);
}
+static int phone_power_status_cb(struct gsmd_atcmd *cmd, void *ctx, char *resp)
+{
+ DEBUGP("resp: %s\n", resp);
+ if (!strncmp(resp, "+CFUN: ", 7))
+ resp += 7;
+ return gsmd_ucmd_submit(ctx, GSMD_MSG_PHONE, GSMD_PHONE_POWER_STATUS,
+ cmd->id, strlen(resp) + 1, resp);
+}
+
static int phone_get_manuf_cb(struct gsmd_atcmd *cmd, void *ctx, char *resp)
{
struct gsmd_user *gu = ctx;
@@ -721,6 +730,11 @@
&phone_powerdown_cb, gu, 0, NULL);
gu->gsmd->dev_state.on = 0;
break;
+ case GSMD_PHONE_POWER_STATUS:
+ cmd = atcmd_fill("AT+CFUN?", 8+1,
+ &phone_power_status_cb, gu, 0, NULL);
+ break;
+
case GSMD_PHONE_GET_IMSI:
return gsmd_ucmd_submit(gu, GSMD_MSG_PHONE, GSMD_PHONE_GET_IMSI,
0, strlen(gu->gsmd->imsi) + 1, gu->gsmd->imsi);
Modified: trunk/src/target/gsm/src/libgsmd/libgsmd_phone.c
===================================================================
--- trunk/src/target/gsm/src/libgsmd/libgsmd_phone.c 2008-03-05 20:26:56 UTC
(rev 4173)
+++ trunk/src/target/gsm/src/libgsmd/libgsmd_phone.c 2008-03-06 09:35:12 UTC
(rev 4174)
@@ -45,6 +45,11 @@
return lgsm_send_simple(lh, GSMD_MSG_PHONE, type);
}
+int lgsm_get_power_status(struct lgsm_handle *lh)
+{
+ return lgsm_send_simple(lh, GSMD_MSG_PHONE, GSMD_PHONE_POWER_STATUS);
+}
+
int lgsm_get_imsi(struct lgsm_handle *lh)
{
return lgsm_send_simple(lh, GSMD_MSG_PHONE, GSMD_PHONE_GET_IMSI);
Modified: trunk/src/target/gsm/src/util/shell.c
===================================================================
--- trunk/src/target/gsm/src/util/shell.c 2008-03-05 20:26:56 UTC (rev
4173)
+++ trunk/src/target/gsm/src/util/shell.c 2008-03-06 09:35:12 UTC (rev
4174)
@@ -425,6 +425,9 @@
else
printf("Modem down\n");
break;
+ case GSMD_PHONE_POWER_STATUS:
+ printf("Antenna Status: %s\n", payload);
+ break;
case GSMD_PHONE_GET_BATTERY:
printf("<BCS>: %d <BCL>: %d \n", bc->bcs, bc->bcl);
break;
@@ -546,6 +549,7 @@
"\tH\tHangup call\n"
"\tO\tAntenna Power On\n"
"\to\tAntenna Power Off\n"
+ "\tgos\tGet Antenna Status\n"
"\tV\tVibrator Enable (CVIB=1)\n"
"\tv\tVibrator Disable (CVIB=0)\n"
"\tM\tModem Power On\n"
@@ -680,6 +684,9 @@
} else if (!strcmp(buf, "o")) {
printf("Power-Off\n");
lgsm_phone_power(lgsmh, 0);
+ } else if (!strcmp(buf, "gos")) {
+ printf("Get Antenna status\n");
+ lgsm_get_power_status(lgsmh, 0);
} else if (!strcmp(buf, "V")) {
printf("Vibrator-Enable\n");
lgsm_phone_vibrator(lgsmh, 1);
--- End Message ---
_______________________________________________
commitlog mailing list
commitlog@lists.openmoko.org
http://lists.openmoko.org/mailman/listinfo/commitlog
