79031b082b
gtk+: Add Upstream-Status ed: Add Upstream-Status gnome-common: Add Upstream-Status libmatchbox: Add Upstream-Status matchbox-wm: Add Upstream-Status x11vnc: Add Upstream-Status xtscal: Add Upstream-Status eds-dbus: Add Upstream-Status matchbox-desktop: Add Upstream-Status matchbox-keyboard: Add Upstream-Status matchbox-stroke: Add Upstream-Status matchbox-theme-sato: Add Upstream-Status owl-video-widget: Add Upstream-Status beecrypt: Add Upstream-Status gnome-icon-theme: Add Upstream-Status tslib: Add Upstream-Status libowl-av: Add Upstream-Status sato-icon-theme: Add Upstream-Status web-webkit: Add Upstream-Status metacity: Add Upstream-Status apr: Add Upstream-Status gdk-pixbuf: Add Upstream-Status pcmanfm: Add Upstream-Status gpgme: Add Upstream-Status eee-acpi-scripts: Add Upstream-Status libgalago: Add Upstream-Status python-pygtk: Add Upstream-Status gnome-mime-data: Add Upstream-Status clutter: Add Upstream-Status clutter-gtk: Add Upstream-Status tidy: Add Upstream-Status mutter: Add Upstream-Status xcursor-transparent-theme: Add Upstream-Status leafpad: Add Upstream-Status matchbox-config-gtk: Add Upstream-Status contacts: Add Upstream-Status dates: Add Upstream-Status web: Add Upstream-Status webkit: Add Upstream-Status - Also removed empty fix_im.patch apr-util: Add Upstream-Status libcroco: Add Upstream-Status liboil: Add Upstream-Status libxslt: Add Upstream-Status libglade: Add Upstream-Status gnome-terminal: Add Upstream-Status xev: Add Upstream-Status claws-mail: Add Upstream-Status clipboard-manager: Add Upstream-Status epdfview: Add Upstream-Status kf: Add Upstream-Status qemu: Add Upstream-Status clutter-gst: Add Upstream-Status table: Add Upstream-Status matchbox-panel-2: Add Upstream-Status (From OE-Core rev: 10bdb737c2c4c6996fd035849109a1e07580a6b9) Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
68 lines
2.1 KiB
Diff
68 lines
2.1 KiB
Diff
---
|
|
src/dates_gtk.c | 5 -----
|
|
src/dates_main.c | 5 +++++
|
|
src/dates_platform.h | 2 +-
|
|
3 files changed, 7 insertions(+), 7 deletions(-)
|
|
|
|
Upstream-Status: Inappropriate [enable feature]
|
|
|
|
Index: git/src/dates_gtk.c
|
|
===================================================================
|
|
--- git.orig/src/dates_gtk.c 2009-08-18 12:44:56.000000000 +0100
|
|
+++ git/src/dates_gtk.c 2009-09-03 22:28:50.000000000 +0100
|
|
@@ -33,10 +33,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)
|
|
@@ -59,7 +55,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: git/src/dates_main.c
|
|
===================================================================
|
|
--- git.orig/src/dates_main.c 2009-08-18 12:44:56.000000000 +0100
|
|
+++ git/src/dates_main.c 2009-09-03 22:29:21.000000000 +0100
|
|
@@ -26,6 +26,8 @@
|
|
#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"
|
|
@@ -582,6 +584,9 @@
|
|
g_free (url_uri);
|
|
}
|
|
|
|
+ owl_set_window_menu (GTK_WINDOW (data.main_window),
|
|
+ GTK_MENU (data.main_menu));
|
|
+
|
|
gtk_main ();
|
|
|
|
return 0;
|
|
Index: git/src/dates_platform.h
|
|
===================================================================
|
|
--- git.orig/src/dates_platform.h 2009-08-18 12:44:56.000000000 +0100
|
|
+++ git/src/dates_platform.h 2009-09-03 22:28:50.000000000 +0100
|
|
@@ -20,7 +20,7 @@
|
|
|
|
#include "dates_types.h"
|
|
|
|
-#ifdef WITH_HILDON
|
|
+#if 1
|
|
#define DATES_MENU_WITHOUT_BAR 1
|
|
#endif
|
|
|