summaryrefslogtreecommitdiff
path: root/meta/packages/pimlico/files/dates-owl-window-menu.patch
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-08-18 13:10:47 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2009-08-18 13:10:47 +0100
commitd8869f3ac30fd3640d8f9b27d7c1c922ef160216 (patch)
tree5487b14b0464c3b5a69f0bbd27bb8151257b95c9 /meta/packages/pimlico/files/dates-owl-window-menu.patch
parent14321b47b9cf8a923a25a5225b68f8b89760bf40 (diff)
downloadopenembedded-core-d8869f3ac30fd3640d8f9b27d7c1c922ef160216.tar.gz
openembedded-core-d8869f3ac30fd3640d8f9b27d7c1c922ef160216.tar.bz2
openembedded-core-d8869f3ac30fd3640d8f9b27d7c1c922ef160216.tar.xz
openembedded-core-d8869f3ac30fd3640d8f9b27d7c1c922ef160216.zip
pimlico: Convert recipes to gnome git
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/packages/pimlico/files/dates-owl-window-menu.patch')
-rw-r--r--meta/packages/pimlico/files/dates-owl-window-menu.patch95
1 files changed, 0 insertions, 95 deletions
diff --git a/meta/packages/pimlico/files/dates-owl-window-menu.patch b/meta/packages/pimlico/files/dates-owl-window-menu.patch
deleted file mode 100644
index a52fd5741..000000000
--- a/meta/packages/pimlico/files/dates-owl-window-menu.patch
+++ /dev/null
@@ -1,95 +0,0 @@
----
- src/Makefile.am | 2 +-
- src/dates_gtk.c | 5 -----
- src/dates_main.c | 5 +++++
- src/dates_platform.h | 2 +-
- 4 files changed, 7 insertions(+), 7 deletions(-)
-
---- dates-0.4.5.orig/src/Makefile.am
-+++ dates-0.4.5/src/Makefile.am
-@@ -33,11 +33,11 @@ dates_SOURCES = $(platform) \
- dates_callbacks.h \
- dates_callbacks.c \
- gconf-bridge.h \
- gconf-bridge.c
-
--dates_LDADD = $(DATES_LIBS) libgtkdatesview.la
-+dates_LDADD = $(DATES_LIBS) libgtkdatesview.la -lowl
-
- if USE_OWL
- dates_LDADD += $(top_builddir)/libowl/libowl.la
- endif
-
---- dates-0.4.5.orig/src/dates_gtk.c
-+++ dates-0.4.5/src/dates_gtk.c
-@@ -30,14 +30,10 @@
- #ifdef WITH_HILDON
- #include <hildon/hildon-color-button.h>
- #endif
-
- #ifndef DATES_PLATFORM_create_main_window
--/* the default implementation assumes that menu is GtkMenuBar */
--#ifdef DATES_MENU_WITHOUT_BAR
--#error Cannot use default create_main_window () if DATES_MENU_WITHOUT_BAR is defined !!!
--#endif
- static GtkWidget *
- create_main_window (DatesData * d, GtkWidget * toolbar,
- GtkWidget * menu, GtkAccelGroup * accel_group)
- {
- GtkWidget *main_vbox;
-@@ -55,11 +51,10 @@ create_main_window (DatesData * d, GtkWi
- main_vbox = gtk_vbox_new (FALSE, 0);
- gtk_widget_show (main_vbox);
- gtk_container_add (GTK_CONTAINER (d->main_window), main_vbox);
-
- gtk_widget_show (menu);
-- gtk_box_pack_start (GTK_BOX (main_vbox), menu, FALSE, FALSE, 0);
-
- gtk_box_pack_end (GTK_BOX (main_vbox), toolbar, FALSE, FALSE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (toolbar), 3);
-
-
---- dates-0.4.5.orig/src/dates_main.c
-+++ dates-0.4.5/src/dates_main.c
-@@ -23,10 +23,12 @@
- #include <math.h>
- #include <libecal/e-cal-time-util.h>
- #include <libical/icaltime.h>
- #include <gconf/gconf-client.h>
-
-+#include <gtk/gtkmenuitem.h>
-+#include <libowl/owlwindowmenu.h>
- #include "dates_types.h"
- #include "dates_platform.h"
- #include "dates_callbacks.h"
-
- #include "gconf-bridge.h"
-@@ -564,10 +566,13 @@ main (int argc, char **argv)
- gtk_widget_show (plug_widget);
- } else {
- gtk_widget_show (data.main_window);
- }
-
-+ owl_set_window_menu (GTK_WINDOW (data.main_window),
-+ GTK_MENU (data.main_menu));
-+
- gtk_main ();
-
- /* clean up */
- g_option_context_free (context);
-
---- dates-0.4.5.orig/src/dates_platform.h
-+++ dates-0.4.5/src/dates_platform.h
-@@ -18,11 +18,11 @@
- #ifndef DATES_UI_GTK_H
- #define DATES_UI_GTK_H
-
- #include "dates_types.h"
-
--#ifdef WITH_HILDON
-+#if 1
- #define DATES_MENU_WITHOUT_BAR 1
- #endif
-
- struct DatesData;
-