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. r3636 - in trunk/src/target/gsm: include/gsmd include/libgsmd
src/gsmd src/libgsmd src/util ([EMAIL PROTECTED])
2. r3637 - / ([EMAIL PROTECTED])
3. r3638 - tags ([EMAIL PROTECTED])
4. r3639 - trunk ([EMAIL PROTECTED])
5. r3640 - trunk/doc ([EMAIL PROTECTED])
6. r3641 - trunk/src/target ([EMAIL PROTECTED])
7. r3642 - trunk/src/target ([EMAIL PROTECTED])
8. r3643 - trunk/src/target ([EMAIL PROTECTED])
9. r3644 - trunk/src/target ([EMAIL PROTECTED])
10. r3645 - in
trunk/src/target/OM-2007.2/applications/openmoko-feedreader2: .
src ([EMAIL PROTECTED])
11. r3646 - in
trunk/src/target/OM-2007.2/applications/openmoko-browser2: . src
([EMAIL PROTECTED])
--- Begin Message ---
Author: erin_yueh
Date: 2007-12-12 13:48:10 +0100 (Wed, 12 Dec 2007)
New Revision: 3636
Modified:
trunk/src/target/gsm/include/gsmd/event.h
trunk/src/target/gsm/include/gsmd/usock.h
trunk/src/target/gsm/include/libgsmd/misc.h
trunk/src/target/gsm/include/libgsmd/pin.h
trunk/src/target/gsm/src/gsmd/usock.c
trunk/src/target/gsm/src/libgsmd/libgsmd_phone.c
trunk/src/target/gsm/src/libgsmd/libgsmd_pin.c
trunk/src/target/gsm/src/util/shell.c
Log:
gsmd: 2nd try for retrieving PIN status (Erin Yueh)
Modified: trunk/src/target/gsm/include/gsmd/event.h
===================================================================
--- trunk/src/target/gsm/include/gsmd/event.h 2007-12-12 12:06:20 UTC (rev
3635)
+++ trunk/src/target/gsm/include/gsmd/event.h 2007-12-12 12:48:10 UTC (rev
3636)
@@ -43,6 +43,25 @@
__NUM_GSMD_PIN
};
+static const char *pin_type_names[__NUM_GSMD_PIN] = {
+ [GSMD_PIN_NONE] = "NONE",
+ [GSMD_PIN_SIM_PIN] = "SIM PIN",
+ [GSMD_PIN_SIM_PUK] = "SIM PUK",
+ [GSMD_PIN_PH_SIM_PIN] = "Phone-to-SIM PIN",
+ [GSMD_PIN_PH_FSIM_PIN] = "Phone-to-very-first SIM PIN",
+ [GSMD_PIN_PH_FSIM_PUK] = "Phone-to-very-first SIM PUK",
+ [GSMD_PIN_SIM_PIN2] = "SIM PIN2",
+ [GSMD_PIN_SIM_PUK2] = "SIM PUK2",
+ [GSMD_PIN_PH_NET_PIN] = "Network personalization PIN",
+ [GSMD_PIN_PH_NET_PUK] = "Network personalizaiton PUK",
+ [GSMD_PIN_PH_NETSUB_PIN]= "Network subset personalisation PIN",
+ [GSMD_PIN_PH_NETSUB_PUK]= "Network subset personalisation PUK",
+ [GSMD_PIN_PH_SP_PIN] = "Service provider personalisation PIN",
+ [GSMD_PIN_PH_SP_PUK] = "Service provider personalisation PUK",
+ [GSMD_PIN_PH_CORP_PIN] = "Corporate personalisation PIN",
+ [GSMD_PIN_PH_CORP_PUK] = "Corporate personalisation PUK",
+};
+
enum gsmd_call_type {
GSMD_CALL_NONE = 0,
GSMD_CALL_UNSPEC = 1,
Modified: trunk/src/target/gsm/include/gsmd/usock.h
===================================================================
--- trunk/src/target/gsm/include/gsmd/usock.h 2007-12-12 12:06:20 UTC (rev
3635)
+++ trunk/src/target/gsm/include/gsmd/usock.h 2007-12-12 12:48:10 UTC (rev
3636)
@@ -89,13 +89,13 @@
enum gsmd_msg_pin_type {
GSMD_PIN_INPUT = 1,
+ GSMD_PIN_GET_STATUS = 2,
};
enum gsmd_msg_phone {
GSMD_PHONE_POWERUP = 1,
GSMD_PHONE_POWERDOWN = 2,
GSMD_PHONE_GET_IMSI = 3,
- GSMD_PIN_GET_STATUS = 4,
};
enum gsmd_msg_modem {
Modified: trunk/src/target/gsm/include/libgsmd/misc.h
===================================================================
--- trunk/src/target/gsm/include/libgsmd/misc.h 2007-12-12 12:06:20 UTC (rev
3635)
+++ trunk/src/target/gsm/include/libgsmd/misc.h 2007-12-12 12:48:10 UTC (rev
3636)
@@ -79,6 +79,5 @@
/* Retrieve IMSI information */
extern int lgsm_get_imsi(struct lgsm_handle *lh);
-/* Get PIN status information */
-extern int lgsm_pin_status(struct lgsm_handle *lh);
+
#endif
Modified: trunk/src/target/gsm/include/libgsmd/pin.h
===================================================================
--- trunk/src/target/gsm/include/libgsmd/pin.h 2007-12-12 12:06:20 UTC (rev
3635)
+++ trunk/src/target/gsm/include/libgsmd/pin.h 2007-12-12 12:48:10 UTC (rev
3636)
@@ -5,5 +5,6 @@
extern int lgsm_pin(struct lgsm_handle *lh, unsigned int type,
const char *pin, const char *newpin);
-
+/* Get PIN status information */
+extern int lgsm_pin_status(struct lgsm_handle *lh);
#endif
Modified: trunk/src/target/gsm/src/gsmd/usock.c
===================================================================
--- trunk/src/target/gsm/src/gsmd/usock.c 2007-12-12 12:06:20 UTC (rev
3635)
+++ trunk/src/target/gsm/src/gsmd/usock.c 2007-12-12 12:48:10 UTC (rev
3636)
@@ -303,47 +303,64 @@
cmd->id, sizeof(ret), &ret);
}
+static int get_cpin_cb(struct gsmd_atcmd *cmd, void *ctx, char *resp)
+{
+ enum gsmd_pin_type type;
+
+ if (!strncmp(resp, "+CPIN: ", 7)) {
+ unsigned int i;
+ resp += 7;
+ for (i = 0; i < __NUM_GSMD_PIN; i++) {
+ if(!strcmp(resp,pin_type_names[i]))
+ type = i;
+ }
+ }
+
+ return gsmd_ucmd_submit(ctx, GSMD_MSG_PIN, GSMD_PIN_GET_STATUS,
+ cmd->id, sizeof(type), &type);
+}
+
static int usock_rcv_pin(struct gsmd_user *gu, struct gsmd_msg_hdr *gph,
int len)
{
struct gsmd_pin *gp = (struct gsmd_pin *) ((void *)gph + sizeof(*gph));
struct gsmd_atcmd *cmd;
- if (gph->len < sizeof(*gp) || len < sizeof(*gp)+sizeof(*gph))
- return -EINVAL;
-
- gsmd_log(GSMD_DEBUG, "pin type=%u, pin='%s', newpin='%s'\n",
- gp->type, gp->pin, gp->newpin);
-
switch (gph->msg_subtype) {
case GSMD_PIN_INPUT:
- /* FIXME */
- break;
- default:
- gsmd_log(GSMD_ERROR, "unknown pin type %u\n",
- gph->msg_subtype);
- return -EINVAL;
- }
+ if (gph->len < sizeof(*gp) || len < sizeof(*gp)+sizeof(*gph))
+ return -EINVAL;
- cmd = atcmd_fill("AT+CPIN=\"", 9+GSMD_PIN_MAXLEN+3+GSMD_PIN_MAXLEN+2,
+ gsmd_log(GSMD_DEBUG, "pin type=%u, pin='%s', newpin='%s'\n",
+ gp->type, gp->pin, gp->newpin);
+
+ cmd = atcmd_fill("AT+CPIN=\"",
9+GSMD_PIN_MAXLEN+3+GSMD_PIN_MAXLEN+2,
&pin_cmd_cb, gu, 0, NULL);
- if (!cmd)
- return -ENOMEM;
+ if (!cmd)
+ return -ENOMEM;
- strncat(cmd->buf, gp->pin, sizeof(gp->pin));
+ strncat(cmd->buf, gp->pin, sizeof(gp->pin));
- switch (gp->type) {
- case GSMD_PIN_SIM_PUK:
- case GSMD_PIN_SIM_PUK2:
- strcat(cmd->buf, "\",\"");
- strncat(cmd->buf, gp->newpin, sizeof(gp->newpin));
+ switch (gp->type) {
+ case GSMD_PIN_SIM_PUK:
+ case GSMD_PIN_SIM_PUK2:
+ strcat(cmd->buf, "\",\"");
+ strncat(cmd->buf, gp->newpin,
sizeof(gp->newpin));
+ break;
+ default:
+ break;
+ }
+ strcat(cmd->buf, "\"");
break;
+ case GSMD_PIN_GET_STATUS:
+ cmd = atcmd_fill("AT+CPIN?", 8 + 1, &get_cpin_cb, gu, 0, NULL);
+ break;
default:
- break;
+ gsmd_log(GSMD_ERROR, "unknown pin type %u\n",
+ gph->msg_subtype);
+ return -EINVAL;
}
- strcat(cmd->buf, "\"");
-
return atcmd_submit(gu->gsmd, cmd);
}
@@ -383,14 +400,6 @@
cmd->id, strlen(resp) + 1, resp);
}
-static int get_cpin_cb(struct gsmd_atcmd *cmd, void *ctx, char *resp)
-{
- DEBUGP("resp: %s\n", resp);
-
- return gsmd_ucmd_submit(ctx, GSMD_MSG_PHONE, GSMD_PIN_GET_STATUS,
- cmd->id, strlen(resp) + 1, resp);
-}
-
static int usock_rcv_phone(struct gsmd_user *gu, struct gsmd_msg_hdr *gph,
int len)
{
@@ -410,10 +419,7 @@
case GSMD_PHONE_GET_IMSI:
cmd = atcmd_fill("AT+CIMI", 7 + 1, &get_imsi_cb, gu, 0, NULL);
break;
-
- case GSMD_PIN_GET_STATUS:
- cmd = atcmd_fill("AT+CPIN?", 8 + 1, &get_cpin_cb, gu, 0, NULL);
- break;
+
default:
return -EINVAL;
}
Modified: trunk/src/target/gsm/src/libgsmd/libgsmd_phone.c
===================================================================
--- trunk/src/target/gsm/src/libgsmd/libgsmd_phone.c 2007-12-12 12:06:20 UTC
(rev 3635)
+++ trunk/src/target/gsm/src/libgsmd/libgsmd_phone.c 2007-12-12 12:48:10 UTC
(rev 3636)
@@ -50,7 +50,3 @@
return lgsm_send_simple(lh, GSMD_MSG_PHONE, GSMD_PHONE_GET_IMSI);
}
-int lgsm_pin_status(struct lgsm_handle *lh)
-{
- return lgsm_send_simple(lh, GSMD_MSG_PHONE, GSMD_PIN_GET_STATUS);
-}
Modified: trunk/src/target/gsm/src/libgsmd/libgsmd_pin.c
===================================================================
--- trunk/src/target/gsm/src/libgsmd/libgsmd_pin.c 2007-12-12 12:06:20 UTC
(rev 3635)
+++ trunk/src/target/gsm/src/libgsmd/libgsmd_pin.c 2007-12-12 12:48:10 UTC
(rev 3636)
@@ -28,25 +28,6 @@
#include <gsmd/event.h>
#include <libgsmd/libgsmd.h>
-static const char *pin_type_names[__NUM_GSMD_PIN] = {
- [GSMD_PIN_NONE] = "NONE",
- [GSMD_PIN_SIM_PIN] = "SIM PIN",
- [GSMD_PIN_SIM_PUK] = "SIM PUK",
- [GSMD_PIN_PH_SIM_PIN] = "Phone-to-SIM PIN",
- [GSMD_PIN_PH_FSIM_PIN] = "Phone-to-very-first SIM PIN",
- [GSMD_PIN_PH_FSIM_PUK] = "Phone-to-very-first SIM PUK",
- [GSMD_PIN_SIM_PIN2] = "SIM PIN2",
- [GSMD_PIN_SIM_PUK2] = "SIM PUK2",
- [GSMD_PIN_PH_NET_PIN] = "Network personalization PIN",
- [GSMD_PIN_PH_NET_PUK] = "Network personalizaiton PUK",
- [GSMD_PIN_PH_NETSUB_PIN]= "Network subset personalisation PIN",
- [GSMD_PIN_PH_NETSUB_PUK]= "Network subset personalisation PUK",
- [GSMD_PIN_PH_SP_PIN] = "Service provider personalisation PIN",
- [GSMD_PIN_PH_SP_PUK] = "Service provider personalisation PUK",
- [GSMD_PIN_PH_CORP_PIN] = "Corporate personalisation PIN",
- [GSMD_PIN_PH_CORP_PUK] = "Corporate personalisation PUK",
-};
-
const char *lgsm_pin_name(enum gsmd_pin_type ptype)
{
if (ptype >= __NUM_GSMD_PIN)
@@ -55,6 +36,11 @@
return pin_type_names[ptype];
}
+int lgsm_pin_status(struct lgsm_handle *lh)
+{
+ return lgsm_send_simple(lh, GSMD_MSG_PIN, GSMD_PIN_GET_STATUS);
+}
+
int lgsm_pin(struct lgsm_handle *lh, unsigned int type,
const char *pin, const char *newpin)
{
@@ -98,3 +84,4 @@
return rc;
}
+
Modified: trunk/src/target/gsm/src/util/shell.c
===================================================================
--- trunk/src/target/gsm/src/util/shell.c 2007-12-12 12:06:20 UTC (rev
3635)
+++ trunk/src/target/gsm/src/util/shell.c 2007-12-12 12:48:10 UTC (rev
3636)
@@ -356,10 +356,6 @@
payload = (char *)gmh + sizeof(*gmh);
printf("imsi <%s>\n", payload);
break;
- case GSMD_PIN_GET_STATUS:
- payload = (char *)gmh + sizeof(*gmh);
- printf("%s\n", payload);
- break;
case GSMD_PHONE_POWERUP:
if (*intresult)
printf("Modem power-up failed: %i\n", *intresult);
@@ -382,11 +378,19 @@
static int pin_msghandler(struct lgsm_handle *lh, struct gsmd_msg_hdr *gmh)
{
int result = *(int *) gmh->data;
-
- if (result)
- printf("PIN error %i\n", result);
- else
- printf("PIN accepted!\n");
+ switch (gmh->msg_subtype) {
+ case GSMD_PIN_GET_STATUS:
+ printf("PIN STATUS: %i\n", result);
+ break;
+ case GSMD_PIN_INPUT:
+ if (result)
+ printf("PIN error %i\n", result);
+ else
+ printf("PIN accepted!\n");
+ break;
+ default:
+ return -EINVAL;
+ }
pending_responses --;
return 0;
}
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-12-12 16:33:55 +0100 (Wed, 12 Dec 2007)
New Revision: 3637
Added:
tags/
Log:
add tags directory
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-12-12 16:36:16 +0100 (Wed, 12 Dec 2007)
New Revision: 3638
Added:
tags/repository-before-first-cleanup-2007-12-12/
Log:
tag repository before cleaning up
Copied: tags/repository-before-first-cleanup-2007-12-12 (from rev 3636, trunk)
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-12-12 16:37:41 +0100 (Wed, 12 Dec 2007)
New Revision: 3639
Removed:
trunk/oe/
Log:
remove oe directory. we no longer operate an OpenEmbedded overlay
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-12-12 16:38:19 +0100 (Wed, 12 Dec 2007)
New Revision: 3640
Removed:
trunk/doc/design-documents-v2/
Log:
remove outdated software design documents
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-12-12 16:39:00 +0100 (Wed, 12 Dec 2007)
New Revision: 3641
Removed:
trunk/src/target/tests/
Log:
remove outdated first application development tests
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-12-12 16:39:20 +0100 (Wed, 12 Dec 2007)
New Revision: 3642
Removed:
trunk/src/target/agpsd/
Log:
remove agpsd directory
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-12-12 16:39:43 +0100 (Wed, 12 Dec 2007)
New Revision: 3643
Removed:
trunk/src/target/mockups/
Log:
remove outdated mockups
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-12-12 16:39:58 +0100 (Wed, 12 Dec 2007)
New Revision: 3644
Removed:
trunk/src/target/OM-2007/
Log:
remove OpenMoko 2007.1
--- End Message ---
--- Begin Message ---
Author: zecke
Date: 2007-12-12 20:19:33 +0100 (Wed, 12 Dec 2007)
New Revision: 3645
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-feedreader2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-feedreader2/src/feed-item-view.c
trunk/src/target/OM-2007.2/applications/openmoko-feedreader2/src/feed-item-view.h
trunk/src/target/OM-2007.2/applications/openmoko-feedreader2/src/main.c
Log:
2007-12-12 Holger Freyther <[EMAIL PROTECTED]>
WebKitPage -> WebKitWebView
webkitglobal -> webkit
* src/feed-item-view.c:
(feed_item_view_init):
(feed_item_view_display):
* src/feed-item-view.h:
* src/main.c:
Modified: trunk/src/target/OM-2007.2/applications/openmoko-feedreader2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-feedreader2/ChangeLog
2007-12-12 15:39:58 UTC (rev 3644)
+++ trunk/src/target/OM-2007.2/applications/openmoko-feedreader2/ChangeLog
2007-12-12 19:19:33 UTC (rev 3645)
@@ -1,3 +1,14 @@
+2007-12-12 Holger Freyther <[EMAIL PROTECTED]>
+
+ WebKitPage -> WebKitWebView
+ webkitglobal -> webkit
+
+ * src/feed-item-view.c:
+ (feed_item_view_init):
+ (feed_item_view_display):
+ * src/feed-item-view.h:
+ * src/main.c:
+
2007-10-04 Holger 'Siddhartha' Freyther <[EMAIL PROTECTED]>
s/WebKitGtk/WebKit/g
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-feedreader2/src/feed-item-view.c
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-feedreader2/src/feed-item-view.c
2007-12-12 15:39:58 UTC (rev 3644)
+++
trunk/src/target/OM-2007.2/applications/openmoko-feedreader2/src/feed-item-view.c
2007-12-12 19:19:33 UTC (rev 3645)
@@ -121,7 +121,7 @@
GtkWidget* scrolled = moko_finger_scroll_new ();
gtk_box_pack_start (GTK_BOX(view), scrolled, TRUE, TRUE, 0);
- view->page = WEBKIT_PAGE(webkit_page_new ());
+ view->page = WEBKIT_WEB_VIEW(webkit_web_view_new ());
gtk_container_add (GTK_CONTAINER(scrolled), GTK_WIDGET(view->page));
/*
@@ -186,7 +186,7 @@
{
gtk_widget_set_sensitive (GTK_WIDGET(view->mail), TRUE);
gtk_widget_set_sensitive (GTK_WIDGET(view->page), TRUE);
- webkit_page_load_html_string (view->page, text, "");
+ webkit_web_view_load_html_string (view->page, text, "");
}
void
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-feedreader2/src/feed-item-view.h
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-feedreader2/src/feed-item-view.h
2007-12-12 15:39:58 UTC (rev 3644)
+++
trunk/src/target/OM-2007.2/applications/openmoko-feedreader2/src/feed-item-view.h
2007-12-12 19:19:33 UTC (rev 3645)
@@ -39,7 +39,7 @@
#define RSS_FEED_ITEM_VIEW_H
#include <gtk/gtk.h>
-#include <webkitgtkpage.h>
+#include <webkitwebview.h>
G_BEGIN_DECLS
@@ -56,7 +56,7 @@
struct _FeedItemView {
GtkVBox parent;
- WebKitPage *page;
+ WebKitWebView *page;
GtkToolItem *back;
GtkToolItem *forward;
GtkToolItem *mail;
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-feedreader2/src/main.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-feedreader2/src/main.c
2007-12-12 15:39:58 UTC (rev 3644)
+++ trunk/src/target/OM-2007.2/applications/openmoko-feedreader2/src/main.c
2007-12-12 19:19:33 UTC (rev 3645)
@@ -27,7 +27,7 @@
#include <gtk/gtk.h>
#include <glib/gi18n.h>
-#include <webkitgtkglobal.h>
+#include <webkit.h>
#include <moko-finger-scroll.h>
#include <moko-stock.h>
--- End Message ---
--- Begin Message ---
Author: zecke
Date: 2007-12-12 20:30:20 +0100 (Wed, 12 Dec 2007)
New Revision: 3646
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-browser2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/browser-data.c
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/go-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:
2007-12-12 Holger Freyther <[EMAIL PROTECTED]>
Update to the recent API of WebKit/Gtk
WebKitFrame -> WebKitWebFrame
WebKitPage -> WebKitWebView
* src/browser-data.c:
(browser_page_new):
* src/browser-data.h:
* src/current-page.c:
(current_back_clicked_closure):
(current_forward_clicked_closure):
(current_add_bookmark_clicked_closure):
(current_progress_changed):
(update_current_page_from_iter):
* src/go-page.c:
(go_clicked):
(create_new_page_clicked):
* src/main.c:
* src/open-pages-page.c:
(open_pages_page_cell_data_func):
Modified: trunk/src/target/OM-2007.2/applications/openmoko-browser2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-browser2/ChangeLog
2007-12-12 19:19:33 UTC (rev 3645)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/ChangeLog
2007-12-12 19:30:20 UTC (rev 3646)
@@ -1,3 +1,26 @@
+2007-12-12 Holger Freyther <[EMAIL PROTECTED]>
+
+ Update to the recent API of WebKit/Gtk
+
+ WebKitFrame -> WebKitWebFrame
+ WebKitPage -> WebKitWebView
+
+ * src/browser-data.c:
+ (browser_page_new):
+ * src/browser-data.h:
+ * src/current-page.c:
+ (current_back_clicked_closure):
+ (current_forward_clicked_closure):
+ (current_add_bookmark_clicked_closure):
+ (current_progress_changed):
+ (update_current_page_from_iter):
+ * src/go-page.c:
+ (go_clicked):
+ (create_new_page_clicked):
+ * src/main.c:
+ * src/open-pages-page.c:
+ (open_pages_page_cell_data_func):
+
2007-10-04 Holger 'Siddhartha' Freyther <[EMAIL PROTECTED]>
s/WebKitGtk/WebKit/g
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/browser-data.c
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/browser-data.c
2007-12-12 19:19:33 UTC (rev 3645)
+++
trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/browser-data.c
2007-12-12 19:30:20 UTC (rev 3646)
@@ -50,7 +50,7 @@
}
BrowserPage*
-browser_page_new (WebKitPage* webKitPage)
+browser_page_new (WebKitWebView* webKitPage)
{
BrowserPage* page = BROWSER_PAGE (g_object_new (BROWSER_TYPE_PAGE, 0));
page->webKitPage = webKitPage;
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
2007-12-12 19:19:33 UTC (rev 3645)
+++
trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/browser-data.h
2007-12-12 19:30:20 UTC (rev 3646)
@@ -27,7 +27,7 @@
#ifndef OPENMOKO_BROWSER_DATA_H
#define OPENMOKO_BROWSER_DATA_H
-#include "webkitgtkpage.h"
+#include "webkitwebview.h"
#include <glib.h>
#include <gtk/gtk.h>
@@ -46,7 +46,7 @@
struct _BrowserPage {
GObject parent;
- WebKitPage* webKitPage;
+ WebKitWebView* webKitPage;
};
struct _BrowserPageClass {
@@ -54,7 +54,7 @@
};
GType browser_page_get_type (void);
-BrowserPage* browser_page_new (WebKitPage* page);
+BrowserPage* browser_page_new (WebKitWebView* page);
/*
* The state of the Browser
@@ -74,8 +74,8 @@
* using HTML and JavaScript and binding the GObject(s) to
* JavaScript.
*/
- WebKitPage* pagesOverviewPage;
- WebKitPage* bookmarkPage;
+ WebKitWebView* pagesOverviewPage;
+ WebKitWebView* bookmarkPage;
/*
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
2007-12-12 19:19:33 UTC (rev 3645)
+++
trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/current-page.c
2007-12-12 19:30:20 UTC (rev 3646)
@@ -28,27 +28,27 @@
#include "current-page.h"
#include <moko-finger-scroll.h>
-#include <webkitgtkframe.h>
-#include <webkitgtkpage.h>
+#include <webkitwebframe.h>
+#include <webkitwebview.h>
/*
* From a list of BrowserPage's in BrowserData::currentPage show
* one as the current one. This means we will GtkContainer::{add,remove}
- * the WebKitPage. To make that work, e.g. not destroying the WebKitPage
+ * the WebKitWebView. To make that work, e.g. not destroying the WebKitWebView
* when we remove it from the container, we will keep a self added reference
- * on all WebKitPages we have created.
+ * on all WebKitWebViews we have created.
*/
static void current_back_clicked_closure(GtkWidget* button, struct
BrowserData* data)
{
g_return_if_fail (data->currentPage);
- webkit_page_go_backward(data->currentPage->webKitPage);
+ webkit_web_view_go_backward(data->currentPage->webKitPage);
}
static void current_forward_clicked_closure(GtkWidget* button, struct
BrowserData* data)
{
g_return_if_fail (data->currentPage);
- webkit_page_go_forward(data->currentPage->webKitPage);
+ webkit_web_view_go_forward(data->currentPage->webKitPage);
}
static void current_stop_reload_clicked_closure(GtkWidget* button, struct
BrowserData* data)
@@ -58,17 +58,17 @@
static void current_add_bookmark_clicked_closure(GtkWidget* button, struct
BrowserData* data)
{
g_return_if_fail (data->currentPage);
- g_print ("Location to bookmark: %s\n", webkit_frame_get_title
(webkit_page_get_main_frame (data->currentPage->webKitPage)));
+ g_print ("Location to bookmark: %s\n", webkit_web_frame_get_title
(webkit_web_view_get_main_frame (data->currentPage->webKitPage)));
}
-static void current_progress_changed(WebKitPage* page, int prog, struct
BrowserData* data)
+static void current_progress_changed(WebKitWebView* page, int prog, struct
BrowserData* data)
{
g_assert (page == data->currentPage->webKitPage);
if (prog == 100) {
- gtk_widget_set_sensitive (GTK_WIDGET (data->currentBack),
webkit_page_can_go_backward (page));
- gtk_widget_set_sensitive (GTK_WIDGET (data->currentForward),
webkit_page_can_go_forward (page));
- gtk_widget_set_sensitive (GTK_WIDGET (data->currentAdd),
webkit_frame_get_title (webkit_page_get_main_frame (page)) != NULL);
+ gtk_widget_set_sensitive (GTK_WIDGET (data->currentBack),
webkit_web_view_can_go_backward (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,8 +176,8 @@
* Update the GtkToolItems
*/
/* XXX ### FIXME TODO check if we should show stop/reload */
- gtk_widget_set_sensitive (GTK_WIDGET (data->currentBack),
webkit_page_can_go_backward (data->currentPage->webKitPage));
- gtk_widget_set_sensitive (GTK_WIDGET (data->currentForward),
webkit_page_can_go_forward (data->currentPage->webKitPage));
- gtk_widget_set_sensitive (GTK_WIDGET (data->currentAdd),
webkit_frame_get_title (webkit_page_get_main_frame
(data->currentPage->webKitPage)) != NULL);
+ gtk_widget_set_sensitive (GTK_WIDGET (data->currentBack),
webkit_web_view_can_go_backward (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/go-page.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/go-page.c
2007-12-12 19:19:33 UTC (rev 3645)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/go-page.c
2007-12-12 19:30:20 UTC (rev 3646)
@@ -123,7 +123,7 @@
else
url = autocorrect_url (gtk_entry_get_text (data->goUrlEntry));
- webkit_page_open (data->currentPage->webKitPage, url);
+ webkit_web_view_open (data->currentPage->webKitPage, url);
gtk_notebook_set_current_page (GTK_NOTEBOOK (data->mainNotebook), 0);
}
@@ -138,10 +138,10 @@
else
url = autocorrect_url (gtk_entry_get_text (data->goUrlEntry));
- BrowserPage* page = browser_page_new (WEBKIT_PAGE (webkit_page_new ()));
+ BrowserPage* page = browser_page_new (WEBKIT_WEB_VIEW (webkit_web_view_new
()));
gtk_list_store_append (data->browserPages, &data->currentPageIter);
gtk_list_store_set (data->browserPages, &data->currentPageIter, 0, page,
-1);
- webkit_page_open (page->webKitPage, url);
+ webkit_web_view_open (page->webKitPage, url);
update_current_page_from_iter (data);
gtk_notebook_set_current_page (GTK_NOTEBOOK (data->mainNotebook), 0);
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
2007-12-12 19:19:33 UTC (rev 3645)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/main.c
2007-12-12 19:30:20 UTC (rev 3646)
@@ -33,7 +33,7 @@
#include <gtk/gtk.h>
#include <glib/gi18n.h>
-#include <webkitgtkglobal.h>
+#include <webkit.h>
#include <moko-finger-scroll.h>
#include <moko-stock.h>
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
2007-12-12 19:19:33 UTC (rev 3645)
+++
trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/open-pages-page.c
2007-12-12 19:30:20 UTC (rev 3646)
@@ -28,8 +28,8 @@
#include "open-pages-page.h"
#include "current-page.h"
-#include <webkitgtkpage.h>
-#include <webkitgtkframe.h>
+#include <webkitwebframe.h>
+#include <webkitwebview.h>
#include <moko-finger-scroll.h>
#include <glib/gi18n.h>
@@ -41,7 +41,7 @@
g_assert (page);
/* XXX, FIXME, TODO check that we don't have any race conditions here. We
might get a new title inside WebKit while using that string? */
- g_object_set (G_OBJECT (ren), "text", webkit_frame_get_title
(webkit_page_get_main_frame (page->webKitPage)), NULL);
+ g_object_set (G_OBJECT (ren), "text", webkit_web_frame_get_title
(webkit_web_view_get_main_frame (page->webKitPage)), NULL);
g_object_unref (page);
}
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
