diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2009-08-18 13:10:47 +0100 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-08-18 13:10:47 +0100 |
| commit | d8869f3ac30fd3640d8f9b27d7c1c922ef160216 (patch) | |
| tree | 5487b14b0464c3b5a69f0bbd27bb8151257b95c9 /meta/packages/pimlico/dates | |
| parent | 14321b47b9cf8a923a25a5225b68f8b89760bf40 (diff) | |
| download | poky-d8869f3ac30fd3640d8f9b27d7c1c922ef160216.tar.gz | |
pimlico: Convert recipes to gnome git
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/packages/pimlico/dates')
| -rw-r--r-- | meta/packages/pimlico/dates/dates-owl-window-menu.patch | 95 |
1 files changed, 95 insertions, 0 deletions
diff --git a/meta/packages/pimlico/dates/dates-owl-window-menu.patch b/meta/packages/pimlico/dates/dates-owl-window-menu.patch new file mode 100644 index 0000000000..a52fd5741b --- /dev/null +++ b/meta/packages/pimlico/dates/dates-owl-window-menu.patch | |||
| @@ -0,0 +1,95 @@ | |||
| 1 | --- | ||
| 2 | src/Makefile.am | 2 +- | ||
| 3 | src/dates_gtk.c | 5 ----- | ||
| 4 | src/dates_main.c | 5 +++++ | ||
| 5 | src/dates_platform.h | 2 +- | ||
| 6 | 4 files changed, 7 insertions(+), 7 deletions(-) | ||
| 7 | |||
| 8 | --- dates-0.4.5.orig/src/Makefile.am | ||
| 9 | +++ dates-0.4.5/src/Makefile.am | ||
| 10 | @@ -33,11 +33,11 @@ dates_SOURCES = $(platform) \ | ||
| 11 | dates_callbacks.h \ | ||
| 12 | dates_callbacks.c \ | ||
| 13 | gconf-bridge.h \ | ||
| 14 | gconf-bridge.c | ||
| 15 | |||
| 16 | -dates_LDADD = $(DATES_LIBS) libgtkdatesview.la | ||
| 17 | +dates_LDADD = $(DATES_LIBS) libgtkdatesview.la -lowl | ||
| 18 | |||
| 19 | if USE_OWL | ||
| 20 | dates_LDADD += $(top_builddir)/libowl/libowl.la | ||
| 21 | endif | ||
| 22 | |||
| 23 | --- dates-0.4.5.orig/src/dates_gtk.c | ||
| 24 | +++ dates-0.4.5/src/dates_gtk.c | ||
| 25 | @@ -30,14 +30,10 @@ | ||
| 26 | #ifdef WITH_HILDON | ||
| 27 | #include <hildon/hildon-color-button.h> | ||
| 28 | #endif | ||
| 29 | |||
| 30 | #ifndef DATES_PLATFORM_create_main_window | ||
| 31 | -/* the default implementation assumes that menu is GtkMenuBar */ | ||
| 32 | -#ifdef DATES_MENU_WITHOUT_BAR | ||
| 33 | -#error Cannot use default create_main_window () if DATES_MENU_WITHOUT_BAR is defined !!! | ||
| 34 | -#endif | ||
| 35 | static GtkWidget * | ||
| 36 | create_main_window (DatesData * d, GtkWidget * toolbar, | ||
| 37 | GtkWidget * menu, GtkAccelGroup * accel_group) | ||
| 38 | { | ||
| 39 | GtkWidget *main_vbox; | ||
| 40 | @@ -55,11 +51,10 @@ create_main_window (DatesData * d, GtkWi | ||
| 41 | main_vbox = gtk_vbox_new (FALSE, 0); | ||
| 42 | gtk_widget_show (main_vbox); | ||
| 43 | gtk_container_add (GTK_CONTAINER (d->main_window), main_vbox); | ||
| 44 | |||
| 45 | gtk_widget_show (menu); | ||
| 46 | - gtk_box_pack_start (GTK_BOX (main_vbox), menu, FALSE, FALSE, 0); | ||
| 47 | |||
| 48 | gtk_box_pack_end (GTK_BOX (main_vbox), toolbar, FALSE, FALSE, 0); | ||
| 49 | gtk_container_set_border_width (GTK_CONTAINER (toolbar), 3); | ||
| 50 | |||
| 51 | |||
| 52 | --- dates-0.4.5.orig/src/dates_main.c | ||
| 53 | +++ dates-0.4.5/src/dates_main.c | ||
| 54 | @@ -23,10 +23,12 @@ | ||
| 55 | #include <math.h> | ||
| 56 | #include <libecal/e-cal-time-util.h> | ||
| 57 | #include <libical/icaltime.h> | ||
| 58 | #include <gconf/gconf-client.h> | ||
| 59 | |||
| 60 | +#include <gtk/gtkmenuitem.h> | ||
| 61 | +#include <libowl/owlwindowmenu.h> | ||
| 62 | #include "dates_types.h" | ||
| 63 | #include "dates_platform.h" | ||
| 64 | #include "dates_callbacks.h" | ||
| 65 | |||
| 66 | #include "gconf-bridge.h" | ||
| 67 | @@ -564,10 +566,13 @@ main (int argc, char **argv) | ||
| 68 | gtk_widget_show (plug_widget); | ||
| 69 | } else { | ||
| 70 | gtk_widget_show (data.main_window); | ||
| 71 | } | ||
| 72 | |||
| 73 | + owl_set_window_menu (GTK_WINDOW (data.main_window), | ||
| 74 | + GTK_MENU (data.main_menu)); | ||
| 75 | + | ||
| 76 | gtk_main (); | ||
| 77 | |||
| 78 | /* clean up */ | ||
| 79 | g_option_context_free (context); | ||
| 80 | |||
| 81 | --- dates-0.4.5.orig/src/dates_platform.h | ||
| 82 | +++ dates-0.4.5/src/dates_platform.h | ||
| 83 | @@ -18,11 +18,11 @@ | ||
| 84 | #ifndef DATES_UI_GTK_H | ||
| 85 | #define DATES_UI_GTK_H | ||
| 86 | |||
| 87 | #include "dates_types.h" | ||
| 88 | |||
| 89 | -#ifdef WITH_HILDON | ||
| 90 | +#if 1 | ||
| 91 | #define DATES_MENU_WITHOUT_BAR 1 | ||
| 92 | #endif | ||
| 93 | |||
| 94 | struct DatesData; | ||
| 95 | |||
