mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-07 16:59:22 +00:00
Code Issues Projects Releases Wiki Activity

owl menu for dates

Browse Source 
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2175 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Tomas Frydrych
2007-07-13 07:23:29 +00:00
parent 10bb42b8e7
commit bf2ebd8ca1
2 changed files with 76 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/packages/pimlico/dates_svn.bb
+4 -1
View File
@@ -4,5 +4,8 @@ DEFAULT_PREFERENCE = "-1"
PV = "0.4.3+svn${SRCDATE}"
S = "${WORKDIR}/trunk"
PR = "r1"
SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http"
SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \
file://dates-owl-window-menu.patch;patch=1 \
"
meta/packages/pimlico/files/dates-owl-window-menu.patch
+72
View File
@@ -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 "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 */