diff options
author | Ross Burton <ross.burton@intel.com> | 2012-08-09 08:46:17 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-08-15 15:26:26 +0100 |
commit | 5e775b5e5c0db6f76546355be22aa029a7cf69fa (patch) | |
tree | 1fb9cbd970702d3495317346b26f844c91934956 /meta/recipes-sato/pimlico/dates/dates-owl-window-menu.patch | |
parent | af8e6b6c57dadb3bf7672d063a98d3baa508c7f4 (diff) | |
download | poky-5e775b5e5c0db6f76546355be22aa029a7cf69fa.tar.gz |
pimlico: Remove
Remove the Pimlico applications (Contacts, Dates, Tasks). oe-core isn't a
reference PIM stack, so we don't need this.
(From OE-Core rev: 373895e6c691277e15a09aee3504243448c55b50)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato/pimlico/dates/dates-owl-window-menu.patch')
-rw-r--r-- | meta/recipes-sato/pimlico/dates/dates-owl-window-menu.patch | 67 |
1 files changed, 0 insertions, 67 deletions
diff --git a/meta/recipes-sato/pimlico/dates/dates-owl-window-menu.patch b/meta/recipes-sato/pimlico/dates/dates-owl-window-menu.patch deleted file mode 100644 index 714623efe6..0000000000 --- a/meta/recipes-sato/pimlico/dates/dates-owl-window-menu.patch +++ /dev/null | |||
@@ -1,67 +0,0 @@ | |||
1 | --- | ||
2 | src/dates_gtk.c | 5 ----- | ||
3 | src/dates_main.c | 5 +++++ | ||
4 | src/dates_platform.h | 2 +- | ||
5 | 3 files changed, 7 insertions(+), 7 deletions(-) | ||
6 | |||
7 | Upstream-Status: Inappropriate [enable feature] | ||
8 | |||
9 | Index: git/src/dates_gtk.c | ||
10 | =================================================================== | ||
11 | --- git.orig/src/dates_gtk.c 2009-08-18 12:44:56.000000000 +0100 | ||
12 | +++ git/src/dates_gtk.c 2009-09-03 22:28:50.000000000 +0100 | ||
13 | @@ -33,10 +33,6 @@ | ||
14 | #endif | ||
15 | |||
16 | #ifndef DATES_PLATFORM_create_main_window | ||
17 | -/* the default implementation assumes that menu is GtkMenuBar */ | ||
18 | -#ifdef DATES_MENU_WITHOUT_BAR | ||
19 | -#error Cannot use default create_main_window () if DATES_MENU_WITHOUT_BAR is defined !!! | ||
20 | -#endif | ||
21 | static GtkWidget * | ||
22 | create_main_window (DatesData * d, GtkWidget * toolbar, | ||
23 | GtkWidget * menu, GtkAccelGroup * accel_group) | ||
24 | @@ -59,7 +55,6 @@ | ||
25 | gtk_container_add (GTK_CONTAINER (d->main_window), main_vbox); | ||
26 | |||
27 | gtk_widget_show (menu); | ||
28 | - gtk_box_pack_start (GTK_BOX (main_vbox), menu, FALSE, FALSE, 0); | ||
29 | |||
30 | gtk_box_pack_end (GTK_BOX (main_vbox), toolbar, FALSE, FALSE, 0); | ||
31 | gtk_container_set_border_width (GTK_CONTAINER (toolbar), 3); | ||
32 | Index: git/src/dates_main.c | ||
33 | =================================================================== | ||
34 | --- git.orig/src/dates_main.c 2009-08-18 12:44:56.000000000 +0100 | ||
35 | +++ git/src/dates_main.c 2009-09-03 22:29:21.000000000 +0100 | ||
36 | @@ -26,6 +26,8 @@ | ||
37 | #include <libical/icaltime.h> | ||
38 | #include <gconf/gconf-client.h> | ||
39 | |||
40 | +#include <gtk/gtkmenuitem.h> | ||
41 | +#include <libowl/owlwindowmenu.h> | ||
42 | #include "dates_types.h" | ||
43 | #include "dates_platform.h" | ||
44 | #include "dates_callbacks.h" | ||
45 | @@ -582,6 +584,9 @@ | ||
46 | g_free (url_uri); | ||
47 | } | ||
48 | |||
49 | + owl_set_window_menu (GTK_WINDOW (data.main_window), | ||
50 | + GTK_MENU (data.main_menu)); | ||
51 | + | ||
52 | gtk_main (); | ||
53 | |||
54 | return 0; | ||
55 | Index: git/src/dates_platform.h | ||
56 | =================================================================== | ||
57 | --- git.orig/src/dates_platform.h 2009-08-18 12:44:56.000000000 +0100 | ||
58 | +++ git/src/dates_platform.h 2009-09-03 22:28:50.000000000 +0100 | ||
59 | @@ -20,7 +20,7 @@ | ||
60 | |||
61 | #include "dates_types.h" | ||
62 | |||
63 | -#ifdef WITH_HILDON | ||
64 | +#if 1 | ||
65 | #define DATES_MENU_WITHOUT_BAR 1 | ||
66 | #endif | ||
67 | |||