summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato/web/web
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-08-27 15:14:24 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2010-08-27 15:29:45 +0100
commit29d6678fd546377459ef75cf54abeef5b969b5cf (patch)
tree8edd65790e37a00d01c3f203f773fe4b5012db18 /meta/recipes-sato/web/web
parentda49de6885ee1bc424e70bc02f21f6ab920efb55 (diff)
downloadpoky-29d6678fd546377459ef75cf54abeef5b969b5cf.tar.gz
Major layout change to the packages directory
Having one monolithic packages directory makes it hard to find things and is generally overwhelming. This commit splits it into several logical sections roughly based on function, recipes.txt gives more information about the classifications used. The opportunity is also used to switch from "packages" to "recipes" as used in OpenEmbedded as the term "packages" can be confusing to people and has many different meanings. Not all recipes have been classified yet, this is just a first pass at separating things out. Some packages are moved to meta-extras as they're no longer actively used or maintained. Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/recipes-sato/web/web')
-rw-r--r--meta/recipes-sato/web/web/owl-window-menu.patch100
1 files changed, 100 insertions, 0 deletions
diff --git a/meta/recipes-sato/web/web/owl-window-menu.patch b/meta/recipes-sato/web/web/owl-window-menu.patch
new file mode 100644
index 0000000000..6e60dd0893
--- /dev/null
+++ b/meta/recipes-sato/web/web/owl-window-menu.patch
@@ -0,0 +1,100 @@
1Index: trunk/src/web_main.c
2===================================================================
3--- trunk.orig/src/web_main.c 2007-04-19 15:41:44.000000000 +0100
4+++ trunk/src/web_main.c 2007-04-26 07:43:23.000000000 +0100
5@@ -20,6 +20,8 @@
6 #include "web_bookmarks.h"
7 #include "web_request.h"
8
9+#include <libowl/owlwindowmenu.h>
10+
11 static void
12 copy_cb (GtkWindow *main_window)
13 {
14@@ -833,10 +835,8 @@
15 main (int argc, char **argv)
16 {
17 GtkWidget *widget;
18-#ifdef WITH_HILDON
19 GList *children, *c;
20 GtkMenu *menu;
21-#endif
22 WebPages pages;
23 GConfClient *client;
24 GModule *module;
25@@ -889,33 +889,12 @@
26 WEB_API_VERSION, pages.backend->api_version);
27 pages.backend->init (&(pages.backend_data), &pages);
28
29-#ifdef WITH_HILDON
30- osso_initialize ("web", "0.0", FALSE, NULL);
31- pages.appview = hildon_appview_new ("");
32- pages.window = hildon_app_new_with_appview (pages.appview);
33- hildon_app_set_title (pages.window, "Web");
34- gtk_widget_show (pages.appview);
35-
36- /* Reparent widgets to hildon appview */
37- widget = glade_xml_get_widget (pages.xml, "main_vbox");
38- gtk_container_remove (
39- GTK_CONTAINER (gtk_widget_get_parent (widget)),
40- g_object_ref (widget));
41- gtk_container_add (GTK_CONTAINER (pages.appview), widget);
42-
43- widget = glade_xml_get_widget (pages.xml, "main_toolbar");
44- gtk_container_remove (
45- GTK_CONTAINER (gtk_widget_get_parent (widget)),
46- g_object_ref (widget));
47- gtk_box_pack_end (GTK_BOX (pages.appview->vbox),
48- widget, TRUE, TRUE, 0);
49- gtk_widget_show_all (GTK_WIDGET (pages.appview->vbox));
50-
51- gtk_widget_destroy (glade_xml_get_widget (pages.xml, "main_window"));
52+ pages.window = glade_xml_get_widget (pages.xml, "main_window");
53
54 /* Reparent menu items */
55 widget = glade_xml_get_widget (pages.xml, "main_menubar");
56- menu = hildon_appview_get_menu (pages.appview);
57+ menu = gtk_menu_new ();
58+
59 children = gtk_container_get_children (GTK_CONTAINER (widget));
60 for (c = children; c; c = c->next) {
61 GtkWidget *menuitem = GTK_WIDGET (c->data);
62@@ -926,12 +905,6 @@
63 gtk_widget_destroy (widget);
64 g_list_free (children);
65
66- g_signal_connect (G_OBJECT (pages.window),
67- "key_press_event", G_CALLBACK (web_key_press_cb), &pages);
68-#else
69- pages.window = glade_xml_get_widget (pages.xml, "main_window");
70-#endif
71-
72 web_bookmarks_init (&pages);
73
74 /* Set history menus */
75@@ -1064,6 +1037,8 @@
76
77 gtk_widget_show (pages.window);
78
79+ owl_set_window_menu (GTK_WINDOW(pages.window), GTK_MENU(menu));
80+
81 gtk_main ();
82
83 g_module_close (module);
84Index: trunk/configure.ac
85===================================================================
86--- trunk.orig/configure.ac 2007-04-19 15:41:44.000000000 +0100
87+++ trunk/configure.ac 2007-04-25 20:36:34.000000000 +0100
88@@ -14,6 +14,12 @@
89
90 PKG_CHECK_MODULES(WEB, libxml-2.0 glib-2.0 gthread-2.0 gtk+-2.0 libglade-2.0 gconf-2.0 gobject-2.0)
91
92+OWL_CFLAGS=""
93+OWL_LIBS="-lowl"
94+
95+WEB_CFLAGS="$WEB_CFLAGS $OWL_CFLAGS"
96+WEB_LIBS="$WEB_LIBS $OWL_LIBS"
97+
98 # -- Hildon stuff for Maemo
99 hildon=false
100 AC_ARG_ENABLE(hildon,AS_HELP_STRING([--enable-hildon],[Turn on hildon support]),[