diff options
| author | Florian Boor <florian.boor@kernelconcepts.de> | 2007-09-06 11:06:30 +0000 |
|---|---|---|
| committer | Florian Boor <florian.boor@kernelconcepts.de> | 2007-09-06 11:06:30 +0000 |
| commit | 2ddfdf8f8bc107332602466cbda4dfe96497d106 (patch) | |
| tree | 8f005b1d5ea3d6224459f3012442b4824e7e175e /packages/pimlico/files/dates-owl-window-menu.patch | |
| parent | 758cda1d54508a6bcb16f18ee0f958063a0c1880 (diff) | |
| parent | 026bb0e021f9c52f0d5707fd140fae1c6457c9bf (diff) | |
merge of '0ffedb7c7f00db7f23e28aec3cbb44abdd01876f'
and '350212948f342818ac60fcc5f0cfe013dd157774'
Diffstat (limited to 'packages/pimlico/files/dates-owl-window-menu.patch')
| -rw-r--r-- | packages/pimlico/files/dates-owl-window-menu.patch | 72 |
1 files changed, 72 insertions, 0 deletions
diff --git a/packages/pimlico/files/dates-owl-window-menu.patch b/packages/pimlico/files/dates-owl-window-menu.patch new file mode 100644 index 0000000000..d47875dd65 --- /dev/null +++ b/packages/pimlico/files/dates-owl-window-menu.patch @@ -0,0 +1,72 @@ +Index: trunk/src/Makefile.am +=================================================================== +--- trunk.orig/src/Makefile.am 2007-07-11 22:16:15.000000000 +0100 ++++ trunk/src/Makefile.am 2007-07-13 08:21:11.000000000 +0100 +@@ -47,7 +47,7 @@ + libgtkdatesviewinclude_HEADERS = \ + dates_view.h + +-dates_LDADD = $(DATES_LIBS) libgtkdatesview.la ++dates_LDADD = $(DATES_LIBS) libgtkdatesview.la -lowl + + if USE_OWL + dates_LDADD += $(top_builddir)/libowl/libowl.la +Index: trunk/src/dates_gtk.c +=================================================================== +--- trunk.orig/src/dates_gtk.c 2007-07-11 22:16:15.000000000 +0100 ++++ trunk/src/dates_gtk.c 2007-07-13 08:33:48.000000000 +0100 +@@ -32,10 +32,6 @@ + #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) +@@ -57,7 +53,6 @@ + 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); +Index: trunk/src/dates_platform.h +=================================================================== +--- trunk.orig/src/dates_platform.h 2007-07-11 22:16:15.000000000 +0100 ++++ trunk/src/dates_platform.h 2007-07-13 08:21:11.000000000 +0100 +@@ -20,7 +20,7 @@ + + #include "dates_types.h" + +-#ifdef WITH_HILDON ++#if 1 + #define DATES_MENU_WITHOUT_BAR 1 + #endif + +Index: trunk/src/dates_main.c +=================================================================== +--- trunk.orig/src/dates_main.c 2007-07-11 22:16:15.000000000 +0100 ++++ trunk/src/dates_main.c 2007-07-13 08:36:11.000000000 +0100 +@@ -25,6 +25,8 @@ + #include <libical/icaltime.h> + #include <gconf/gconf-client.h> + ++#include <gtk/gtkmenuitem.h> ++#include "owlwindowmenu.h" + #include "dates_types.h" + #include "dates_platform.h" + #include "dates_callbacks.h" +@@ -566,6 +568,9 @@ + gtk_widget_show (data.main_window); + } + ++ owl_set_window_menu (GTK_WINDOW (data.main_window), ++ GTK_MENU (data.main_menu)); ++ + gtk_main (); + + /* clean up */ |