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>
55 lines
2 KiB
Diff
55 lines
2 KiB
Diff
Upstream-Status: Inappropriate [enable feature]
|
|
|
|
Index: contacts-0.9/src/contacts-gtk.c
|
|
===================================================================
|
|
--- contacts-0.9.orig/src/contacts-gtk.c 2008-06-06 12:56:08.000000000 +0100
|
|
+++ contacts-0.9/src/contacts-gtk.c 2008-06-16 08:14:28.000000000 +0100
|
|
@@ -220,8 +220,8 @@
|
|
vbox7 = gtk_vbox_new (FALSE, 0);
|
|
gtk_container_add (GTK_CONTAINER (main_window), vbox7);
|
|
|
|
- main_menubar = gtk_menu_bar_new ();
|
|
- gtk_box_pack_start (GTK_BOX (vbox7), main_menubar, FALSE, FALSE, 0);
|
|
+ main_menubar = gtk_menu_new ();
|
|
+ gtk_widget_show (main_menubar);
|
|
|
|
contacts_menu = gtk_menu_item_new_with_mnemonic (_("C_ontacts"));
|
|
gtk_container_add (GTK_CONTAINER (main_menubar), contacts_menu);
|
|
Index: contacts-0.9/src/Makefile.am
|
|
===================================================================
|
|
--- contacts-0.9.orig/src/Makefile.am 2008-06-03 09:16:56.000000000 +0100
|
|
+++ contacts-0.9/src/Makefile.am 2008-06-16 08:15:34.000000000 +0100
|
|
@@ -40,7 +40,7 @@
|
|
contacts-@FRONTEND@.c \
|
|
contacts-@FRONTEND@.h
|
|
|
|
-contacts_LDADD = $(CONTACTS_LIBS) $(DBUS_LIBS)
|
|
+contacts_LDADD = $(CONTACTS_LIBS) $(DBUS_LIBS) -lowl
|
|
|
|
contacts_LDFLAGS = @CONTACTS_LIBS@ @DBUS_LIBS@
|
|
|
|
Index: contacts-0.9/src/contacts-main.c
|
|
===================================================================
|
|
--- contacts-0.9.orig/src/contacts-main.c 2008-06-06 10:26:52.000000000 +0100
|
|
+++ contacts-0.9/src/contacts-main.c 2008-06-16 08:14:28.000000000 +0100
|
|
@@ -27,6 +27,8 @@
|
|
#include <libgnomevfs/gnome-vfs.h>
|
|
#endif
|
|
|
|
+#include <libowl/owlwindowmenu.h>
|
|
+
|
|
#include "bacon-message-connection.h"
|
|
#include "contacts-defs.h"
|
|
#include "contacts-utils.h"
|
|
@@ -266,6 +268,10 @@
|
|
gtk_widget_show_all (widget);
|
|
}
|
|
|
|
+ gtk_widget_show_all (data->ui->main_menubar);
|
|
+ owl_set_window_menu (GTK_WINDOW (data->ui->main_window),
|
|
+ GTK_MENU (data->ui->main_menubar));
|
|
+
|
|
gtk_main ();
|
|
|
|
/* if we have modified the current contact, but not saved it, do so now */
|