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. r2998 - in
trunk/src/target/OM-2007.2/applications/openmoko-browser2: . src
([EMAIL PROTECTED])
2. r2999 - in
trunk/src/target/OM-2007.2/applications/openmoko-browser2: . src
([EMAIL PROTECTED])
3. r3000 - in
trunk/src/target/OM-2007.2/applications/openmoko-browser2: . src
([EMAIL PROTECTED])
4. r3001 - in
trunk/src/target/OM-2007.2/applications/openmoko-browser2: . src
([EMAIL PROTECTED])
5. r3002 - in
trunk/src/target/OM-2007.2/applications/openmoko-browser2: . src
([EMAIL PROTECTED])
6. r3003 - in
trunk/src/target/OM-2007.2/applications/openmoko-browser2: . src
([EMAIL PROTECTED])
--- Begin Message ---
Author: zecke
Date: 2007-09-18 03:40:51 +0200 (Tue, 18 Sep 2007)
New Revision: 2998
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-browser2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/current-page.c
Log:
2007-09-17 Holger Hans Peter Freyther <[EMAIL PROTECTED]>
Always show the WebKitGtkPage.
* src/current-page.c:
(set_current_page):
Modified: trunk/src/target/OM-2007.2/applications/openmoko-browser2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-browser2/ChangeLog
2007-09-18 01:40:50 UTC (rev 2997)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/ChangeLog
2007-09-18 01:40:51 UTC (rev 2998)
@@ -1,5 +1,12 @@
2007-09-17 Holger Hans Peter Freyther <[EMAIL PROTECTED]>
+ Always show the WebKitGtkPage.
+
+ * src/current-page.c:
+ (set_current_page):
+
+2007-09-17 Holger Hans Peter Freyther <[EMAIL PROTECTED]>
+
Temporarily use GtkScrolledWindow due bugs in MokoFingerScroll
* src/current-page.c:
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-09-18 01:40:50 UTC (rev 2997)
+++
trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/current-page.c
2007-09-18 01:40:51 UTC (rev 2998)
@@ -151,6 +151,7 @@
data->currentPage = page;
g_signal_connect(data->currentPage->webKitPage,
"load-progress-changed", G_CALLBACK(current_progress_changed), data);
gtk_container_add (GTK_CONTAINER (data->currentFingerScroll),
GTK_WIDGET (data->currentPage->webKitPage));
+ gtk_widget_show (GTK_WIDGET (data->currentPage->webKitPage));
/*
* Update the GtkToolItems
--- End Message ---
--- Begin Message ---
Author: zecke
Date: 2007-09-18 03:40:53 +0200 (Tue, 18 Sep 2007)
New Revision: 2999
Added:
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.h
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-browser2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/Makefile.am
trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/browser-data.h
trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/main.c
Log:
2007-09-17 Holger Hans Peter Freyther <[EMAIL PROTECTED]>
Implement to switch pages. Currently Gtk+ is broken and
insists in changing the GtkTreeSelection and there is no
working way to unselect the selection.
This is responsible for the bug where you have to click twice
on the "Open Pages"-Page to be able to switch the tab.
* src/Makefile.am:
* src/browser-data.h:
* src/main.c:
(setup_ui):
* src/open-pages-page.c: Added.
(find_browser_page):
(selection_changed):
(pages_add_to_list_store):
(switched_notebook_tab):
(setup_open_pages_page):
* src/open-pages-page.h: Added.
Modified: trunk/src/target/OM-2007.2/applications/openmoko-browser2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-browser2/ChangeLog
2007-09-18 01:40:51 UTC (rev 2998)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/ChangeLog
2007-09-18 01:40:53 UTC (rev 2999)
@@ -1,5 +1,25 @@
2007-09-17 Holger Hans Peter Freyther <[EMAIL PROTECTED]>
+ Implement to switch pages. Currently Gtk+ is broken and
+ insists in changing the GtkTreeSelection and there is no
+ working way to unselect the selection.
+ This is responsible for the bug where you have to click twice
+ on the "Open Pages"-Page to be able to switch the tab.
+
+ * src/Makefile.am:
+ * src/browser-data.h:
+ * src/main.c:
+ (setup_ui):
+ * src/open-pages-page.c: Added.
+ (find_browser_page):
+ (selection_changed):
+ (pages_add_to_list_store):
+ (switched_notebook_tab):
+ (setup_open_pages_page):
+ * src/open-pages-page.h: Added.
+
+2007-09-17 Holger Hans Peter Freyther <[EMAIL PROTECTED]>
+
Always show the WebKitGtkPage.
* src/current-page.c:
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/Makefile.am
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/Makefile.am
2007-09-18 01:40:51 UTC (rev 2998)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/Makefile.am
2007-09-18 01:40:53 UTC (rev 2999)
@@ -7,8 +7,8 @@
bin_PROGRAMS = openmoko-browser
-EXTRA_DIST = browser-data.h current-page.h go-page.h
-openmoko_browser_SOURCES = main.c current-page.c go-page.c
+EXTRA_DIST = browser-data.h current-page.h go-page.h open-pages-page.h
+openmoko_browser_SOURCES = main.c current-page.c go-page.c open-pages-page.c
openmoko_browser_LDADD = @OPENMOKO_LIBS@ @WEBKITGTK_LIBS@ @GTHREAD_LIBS@
CLEANFILES = $(stamp_files)
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-09-18 01:40:51 UTC (rev 2998)
+++
trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/browser-data.h
2007-09-18 01:40:53 UTC (rev 2999)
@@ -77,6 +77,13 @@
GtkEntry* goSearchEntry;
GtkWidget* goButton;
GtkWidget* goButtonNewPage;
+
+ /*
+ * Open-Pages-Page
+ */
+ GtkWidget* pagesBox;
+ GtkListStore* pagesStore;
+ GtkTreeView* pagesView;
};
#endif
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-09-18 01:40:51 UTC (rev 2998)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/main.c
2007-09-18 01:40:53 UTC (rev 2999)
@@ -28,6 +28,7 @@
#include "current-page.h"
#include "go-page.h"
+#include "open-pages-page.h"
#include <gtk/gtk.h>
#include <glib/gi18n.h>
@@ -91,11 +92,16 @@
setup_current_page (GTK_BOX (box), data);
box = gtk_vbox_new (FALSE, 0);
- gtk_notebook_append_page (GTK_NOTEBOOK (data->mainNotebook), box,
gtk_image_new_from_icon_name("browser-go", GTK_ICON_SIZE_LARGE_TOOLBAR));
+ gtk_notebook_append_page (GTK_NOTEBOOK (data->mainNotebook), box,
gtk_image_new_from_icon_name ("browser-go", GTK_ICON_SIZE_LARGE_TOOLBAR));
gtk_container_child_set (GTK_CONTAINER (data->mainNotebook), box,
"tab-expand", TRUE, "tab-fill", TRUE, NULL);
setup_go_page (GTK_BOX(box), data);
+ box = gtk_vbox_new (FALSE, 0);
+ gtk_notebook_append_page (GTK_NOTEBOOK (data->mainNotebook), box,
gtk_image_new_from_icon_name ("browser-pages", GTK_ICON_SIZE_LARGE_TOOLBAR));
+ gtk_container_child_set (GTK_CONTAINER (data->mainNotebook), box,
"tab-expand", TRUE, "tab-fill", TRUE, NULL);
+ setup_open_pages_page (GTK_BOX(box), data);
+
gtk_widget_show_all (GTK_WIDGET (data->mainWindow));
}
Added:
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-09-18 01:40:51 UTC (rev 2998)
+++
trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/open-pages-page.c
2007-09-18 01:40:53 UTC (rev 2999)
@@ -0,0 +1,113 @@
+/*
+ * A simple WebBrowser
+ *
+ * Copyright (C) 2007 Holger Hans Peter Freyther
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Current Version: $Rev$ ($Date$) [$Author$]
+ */
+
+#include "config.h"
+#include "open-pages-page.h"
+#include "current-page.h"
+
+#include <webkitgtkpage.h>
+#include <webkitgtkframe.h>
+#include <moko-finger-scroll.h>
+
+#include <glib/gi18n.h>
+
+static gint find_browser_page (struct BrowserPage* page, WebKitGtkPage*
webKitPage)
+{
+ return !(page->webKitPage == webKitPage);
+}
+
+/*
+ * Switch the current page and the GtkNotebook page
+ */
+static void selection_changed(GtkTreeSelection* selection, struct BrowserData*
data)
+{
+ GtkTreeModel* model;
+ GtkTreeIter iter;
+ gboolean has_selection = gtk_tree_selection_get_selected (selection,
&model, &iter);
+
+ if (!has_selection)
+ return;
+
+ WebKitGtkPage* page = 0;
+ gtk_tree_model_get (model, &iter, 1, &page, -1);
+ g_assert (page);
+
+ /*
+ * now find a page a BrowserPage
+ */
+ GList* element = g_list_find_custom(data->browserPages, page,
(GCompareFunc)find_browser_page);
+ if (element) {
+ set_current_page ((struct BrowserPage*)element->data, data);
+ gtk_notebook_set_current_page (GTK_NOTEBOOK (data->mainNotebook), 0);
+ }
+
+ g_object_unref (page);
+}
+
+
+static void pages_add_to_list_store(struct BrowserPage* page, GtkListStore*
store)
+{
+ GtkTreeIter iter;
+ gtk_list_store_append (store, &iter);
+ gtk_list_store_set (store, &iter,
+ 0, g_strdup (webkit_gtk_frame_get_title
(webkit_gtk_page_get_main_frame (page->webKitPage))),
+ 1, page->webKitPage,
+ -1);
+}
+
+/*
+ * For now rebuild the GtkListStore
+ *
+ * XXX FIXME TODO Make Current, Go and Pages use the same GtkListStore
+ * and share the code with the bookmarks.
+ */
+static void switched_notebook_tab(GtkNotebook* notebook, GtkNotebookPage*
page, guint page_num, struct BrowserData* data)
+{
+ if (gtk_notebook_get_nth_page (notebook, page_num) == data->pagesBox) {
+ gtk_list_store_clear (data->pagesStore);
+ g_list_foreach (data->browserPages, (GFunc)pages_add_to_list_store,
data->pagesStore);
+ }
+}
+
+void setup_open_pages_page(GtkBox* box, struct BrowserData* data)
+{
+ data->pagesBox = GTK_WIDGET (box);
+ g_signal_connect (data->mainNotebook, "switch-page",
G_CALLBACK(switched_notebook_tab), data);
+
+ /* URL/title and WebKitGtkPage, as it is a GObject */
+ data->pagesStore = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_OBJECT);
+
+ GtkContainer* scrolled = GTK_CONTAINER (moko_finger_scroll_new ());
+ gtk_box_pack_start (box, GTK_WIDGET(scrolled), TRUE, TRUE, 0);
+ data->pagesView = GTK_TREE_VIEW (gtk_tree_view_new_with_model
(GTK_TREE_MODEL (data->pagesStore)));
+ gtk_container_add (scrolled, GTK_WIDGET (data->pagesView));
+ g_signal_connect (gtk_tree_view_get_selection (data->pagesView),
"changed", G_CALLBACK(selection_changed), data);
+
+ GtkCellRenderer* ren = GTK_CELL_RENDERER (gtk_cell_renderer_text_new ());
+ GtkTreeViewColumn* column = gtk_tree_view_column_new_with_attributes
(_("Title"), ren, "text", 0, NULL);
+ gtk_tree_view_column_set_expand (column, TRUE);
+ gtk_tree_view_append_column (data->pagesView, column);
+}
Added:
trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/open-pages-page.h
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/open-pages-page.h
2007-09-18 01:40:51 UTC (rev 2998)
+++
trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/open-pages-page.h
2007-09-18 01:40:53 UTC (rev 2999)
@@ -0,0 +1,34 @@
+/*
+ * A simple WebBrowser
+ *
+ * Copyright (C) 2007 Holger Hans Peter Freyther
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Current Version: $Rev$ ($Date$) [$Author$]
+ */
+
+#ifndef OPENMOKO_OPEN_PAGES_PAGE_H
+#define OPENMOKO_OPEN_PAGES_PAGE_H
+
+#include "browser-data.h"
+
+void setup_open_pages_page(GtkBox* box, struct BrowserData* data);
+
+#endif
--- End Message ---
--- Begin Message ---
Author: zecke
Date: 2007-09-18 03:40:56 +0200 (Tue, 18 Sep 2007)
New Revision: 3000
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-browser2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/open-pages-page.c
Log:
2007-09-17 Holger Hans Peter Freyther <[EMAIL PROTECTED]>
Due the Gtk+ bug disable automatically switching pages. This
will be reenabled once GtkTreeView, GtkTreeSelection is battled
again.
* src/open-pages-page.c:
(selection_changed):
Modified: trunk/src/target/OM-2007.2/applications/openmoko-browser2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-browser2/ChangeLog
2007-09-18 01:40:53 UTC (rev 2999)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/ChangeLog
2007-09-18 01:40:56 UTC (rev 3000)
@@ -1,5 +1,14 @@
2007-09-17 Holger Hans Peter Freyther <[EMAIL PROTECTED]>
+ Due the Gtk+ bug disable automatically switching pages. This
+ will be reenabled once GtkTreeView, GtkTreeSelection is battled
+ again.
+
+ * src/open-pages-page.c:
+ (selection_changed):
+
+2007-09-17 Holger Hans Peter Freyther <[EMAIL PROTECTED]>
+
Implement to switch pages. Currently Gtk+ is broken and
insists in changing the GtkTreeSelection and there is no
working way to unselect the selection.
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-09-18 01:40:53 UTC (rev 2999)
+++
trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/open-pages-page.c
2007-09-18 01:40:56 UTC (rev 3000)
@@ -59,10 +59,8 @@
* now find a page a BrowserPage
*/
GList* element = g_list_find_custom(data->browserPages, page,
(GCompareFunc)find_browser_page);
- if (element) {
+ if (element)
set_current_page ((struct BrowserPage*)element->data, data);
- gtk_notebook_set_current_page (GTK_NOTEBOOK (data->mainNotebook), 0);
- }
g_object_unref (page);
}
--- End Message ---
--- Begin Message ---
Author: zecke
Date: 2007-09-18 03:40:57 +0200 (Tue, 18 Sep 2007)
New Revision: 3001
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-browser2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/go-page.c
Log:
2007-09-17 Holger Hans Peter Freyther <[EMAIL PROTECTED]>
Change the button label depending on if we are going
to search or to navigate to a url directly.
* src/go-page.c:
(url_entry_changed):
(search_entry_changed):
(setup_go_page):
Modified: trunk/src/target/OM-2007.2/applications/openmoko-browser2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-browser2/ChangeLog
2007-09-18 01:40:56 UTC (rev 3000)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/ChangeLog
2007-09-18 01:40:57 UTC (rev 3001)
@@ -1,5 +1,15 @@
2007-09-17 Holger Hans Peter Freyther <[EMAIL PROTECTED]>
+ Change the button label depending on if we are going
+ to search or to navigate to a url directly.
+
+ * src/go-page.c:
+ (url_entry_changed):
+ (search_entry_changed):
+ (setup_go_page):
+
+2007-09-17 Holger Hans Peter Freyther <[EMAIL PROTECTED]>
+
Due the Gtk+ bug disable automatically switching pages. This
will be reenabled once GtkTreeView, GtkTreeSelection is battled
again.
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-09-18 01:40:56 UTC (rev 3000)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/go-page.c
2007-09-18 01:40:57 UTC (rev 3001)
@@ -96,12 +96,22 @@
return FALSE;
}
-static void search_url_entry_changed(GtkEntry* entry, GtkWidget*
complementary_entry)
+static void url_entry_changed(GtkEntry* entry, struct BrowserData* data)
{
const gchar* text = gtk_entry_get_text (entry);
- gtk_widget_set_sensitive(complementary_entry, !strcmp(text,
search_names[SearchEntry]) || !strcmp(text, search_names[UrlEntry]) ||
strlen(text) == 0);
+ gtk_widget_set_sensitive (GTK_WIDGET (data->goSearchEntry), !strcmp(text,
search_names[UrlEntry]) || strlen(text) == 0);
+ gtk_button_set_label (GTK_BUTTON(data->goButton), _(search_names[GoUrl]));
+ gtk_button_set_label (GTK_BUTTON(data->goButtonNewPage),
_(search_names[GoNewPageUrl]));
}
+static void search_entry_changed(GtkEntry* entry, struct BrowserData* data)
+{
+ const gchar* text = gtk_entry_get_text (entry);
+ gtk_widget_set_sensitive (GTK_WIDGET (data->goUrlEntry), !strcmp(text,
search_names[SearchEntry]) || strlen(text) == 0);
+ gtk_button_set_label (GTK_BUTTON(data->goButton),
_(search_names[GoSearch]));
+ gtk_button_set_label (GTK_BUTTON(data->goButtonNewPage),
_(search_names[GoNewPageSearch]));
+}
+
static void go_clicked(GtkButton* btn, struct BrowserData* data)
{
g_return_if_fail (data->currentPage);
@@ -164,12 +174,12 @@
data->goUrlEntry = GTK_ENTRY (gtk_entry_new ());
data->goSearchEntry = GTK_ENTRY (gtk_entry_new ());
gtk_box_pack_start (box, GTK_WIDGET (data->goUrlEntry), FALSE, TRUE, 0);
- g_signal_connect(data->goUrlEntry, "changed",
G_CALLBACK(search_url_entry_changed), data->goSearchEntry);
+ g_signal_connect(data->goUrlEntry, "changed",
G_CALLBACK(url_entry_changed), data);
g_signal_connect(data->goUrlEntry, "focus-in-event",
G_CALLBACK(entry_focus_in), (gpointer)search_names[UrlEntry]);
g_signal_connect(data->goUrlEntry, "focus-out-event",
G_CALLBACK(entry_focus_out), (gpointer)search_names[UrlEntry]);
gtk_box_pack_start (box, GTK_WIDGET (data->goSearchEntry), FALSE, TRUE, 0);
- g_signal_connect(data->goSearchEntry, "changed",
G_CALLBACK(search_url_entry_changed), data->goUrlEntry);
+ g_signal_connect(data->goSearchEntry, "changed",
G_CALLBACK(search_entry_changed), data);
g_signal_connect(data->goSearchEntry, "focus-in-event",
G_CALLBACK(entry_focus_in), (gpointer)search_names[SearchEntry]);
g_signal_connect(data->goSearchEntry, "focus-out-event",
G_CALLBACK(entry_focus_out), (gpointer)search_names[SearchEntry]);
--- End Message ---
--- Begin Message ---
Author: zecke
Date: 2007-09-18 03:40:58 +0200 (Tue, 18 Sep 2007)
New Revision: 3002
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-browser2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/current-page.c
Log:
2007-09-17 Holger Hans Peter Freyther <[EMAIL PROTECTED]>
Work around another Gtk+ crash. If we remove a WebKitGtkPage
and add another one (gtk_container_{add,remove}) without accesing
the event loop we will get a crash.
The work around is to switch to the selection page to select a webpage
* src/current-page.c:
(current_close_page):
Modified: trunk/src/target/OM-2007.2/applications/openmoko-browser2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-browser2/ChangeLog
2007-09-18 01:40:57 UTC (rev 3001)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/ChangeLog
2007-09-18 01:40:58 UTC (rev 3002)
@@ -1,5 +1,15 @@
2007-09-17 Holger Hans Peter Freyther <[EMAIL PROTECTED]>
+ Work around another Gtk+ crash. If we remove a WebKitGtkPage
+ and add another one (gtk_container_{add,remove}) without accesing
+ the event loop we will get a crash.
+ The work around is to switch to the selection page to select a webpage
+
+ * src/current-page.c:
+ (current_close_page):
+
+2007-09-17 Holger Hans Peter Freyther <[EMAIL PROTECTED]>
+
Change the button label depending on if we are going
to search or to navigate to a url directly.
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-09-18 01:40:57 UTC (rev 3001)
+++
trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/current-page.c
2007-09-18 01:40:58 UTC (rev 3002)
@@ -73,8 +73,8 @@
/* To destroy the WebKitGtkPage we will g_object_unref it */
struct BrowserPage* oldCurrent = data->currentPage;
data->browserPages = g_list_remove (data->browserPages, oldCurrent);
- struct BrowserPage* newPage = g_list_first(data->browserPages) ?
g_list_first(data->browserPages)->data : NULL;
- set_current_page (newPage, data);
+ set_current_page (NULL, data);
+ gtk_notebook_set_current_page (GTK_NOTEBOOK (data->mainNotebook), 2);
g_object_unref (oldCurrent->webKitPage);
--- End Message ---
--- Begin Message ---
Author: zecke
Date: 2007-09-18 03:41:00 +0200 (Tue, 18 Sep 2007)
New Revision: 3003
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-browser2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/current-page.c
Log:
2007-09-17 Holger Hans Peter Freyther <[EMAIL PROTECTED]>
Go to the "Go"-Page if we have no other open BrowserPage
* src/current-page.c:
(current_close_page):
Modified: trunk/src/target/OM-2007.2/applications/openmoko-browser2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-browser2/ChangeLog
2007-09-18 01:40:58 UTC (rev 3002)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/ChangeLog
2007-09-18 01:41:00 UTC (rev 3003)
@@ -1,5 +1,12 @@
2007-09-17 Holger Hans Peter Freyther <[EMAIL PROTECTED]>
+ Go to the "Go"-Page if we have no other open BrowserPage
+
+ * src/current-page.c:
+ (current_close_page):
+
+2007-09-17 Holger Hans Peter Freyther <[EMAIL PROTECTED]>
+
Work around another Gtk+ crash. If we remove a WebKitGtkPage
and add another one (gtk_container_{add,remove}) without accesing
the event loop we will get a crash.
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-09-18 01:40:58 UTC (rev 3002)
+++
trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/current-page.c
2007-09-18 01:41:00 UTC (rev 3003)
@@ -74,7 +74,8 @@
struct BrowserPage* oldCurrent = data->currentPage;
data->browserPages = g_list_remove (data->browserPages, oldCurrent);
set_current_page (NULL, data);
- gtk_notebook_set_current_page (GTK_NOTEBOOK (data->mainNotebook), 2);
+ gtk_notebook_set_current_page (GTK_NOTEBOOK (data->mainNotebook),
+ g_list_first(data->browserPages) ? 2 : 1);
g_object_unref (oldCurrent->webKitPage);
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
