summaryrefslogtreecommitdiffstats
path: root/meta/packages
diff options
context:
space:
mode:
authorRobert Bradford <rob@openedhand.com>2008-02-27 15:39:07 +0000
committerRobert Bradford <rob@openedhand.com>2008-02-27 15:39:07 +0000
commitddb23648271561977518e6658b8bd4d8ba24081c (patch)
treee333cd92c7cb354c49b99c1c06d7155e014568f3 /meta/packages
parent212bd6f2504eb25f07cd91e023860f2aad15fe84 (diff)
downloadpoky-ddb23648271561977518e6658b8bd4d8ba24081c.tar.gz
Add a patch that avoids the entry getting focus and thus bringing up the
keyboard. Remove old patch directory. git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3872 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages')
-rw-r--r--meta/packages/pimlico/contacts-0.8/contacts-owl-window-menu.patch52
-rw-r--r--meta/packages/pimlico/contacts_0.8.bb1
-rw-r--r--meta/packages/pimlico/files/contacts-focus-avoidance.patch36
3 files changed, 37 insertions, 52 deletions
diff --git a/meta/packages/pimlico/contacts-0.8/contacts-owl-window-menu.patch b/meta/packages/pimlico/contacts-0.8/contacts-owl-window-menu.patch
deleted file mode 100644
index 1fbf1dcc2a..0000000000
--- a/meta/packages/pimlico/contacts-0.8/contacts-owl-window-menu.patch
+++ /dev/null
@@ -1,52 +0,0 @@
1Index: contacts-0.5/src/contacts-gtk.c
2===================================================================
3--- contacts-0.5.orig/src/contacts-gtk.c 2007-04-20 14:35:36.000000000 +0100
4+++ contacts-0.5/src/contacts-gtk.c 2007-07-13 10:47:52.000000000 +0100
5@@ -178,8 +178,8 @@
6 vbox7 = gtk_vbox_new (FALSE, 0);
7 gtk_container_add (GTK_CONTAINER (main_window), vbox7);
8
9- main_menubar = gtk_menu_bar_new ();
10- gtk_box_pack_start (GTK_BOX (vbox7), main_menubar, FALSE, FALSE, 0);
11+ main_menubar = gtk_menu_new ();
12+ gtk_widget_show (main_menubar);
13
14 contacts_menu = gtk_menu_item_new_with_mnemonic (_("_Contacts"));
15 gtk_container_add (GTK_CONTAINER (main_menubar), contacts_menu);
16Index: contacts-0.5/src/Makefile.am
17===================================================================
18--- contacts-0.5.orig/src/Makefile.am 2007-03-02 11:17:00.000000000 +0000
19+++ contacts-0.5/src/Makefile.am 2007-07-13 10:47:52.000000000 +0100
20@@ -28,7 +28,7 @@
21 contacts-@FRONTEND@.c \
22 contacts-@FRONTEND@.h
23
24-contacts_LDADD = $(CONTACTS_LIBS)
25+contacts_LDADD = $(CONTACTS_LIBS) -lowl
26 contacts_LDFLAGS = @CONTACTS_LIBS@
27
28 MAINTAINERCLEANFILES = config.h.in Makefile.in
29Index: contacts-0.5/src/contacts-main.c
30===================================================================
31--- contacts-0.5.orig/src/contacts-main.c 2007-04-20 15:46:23.000000000 +0100
32+++ contacts-0.5/src/contacts-main.c 2007-07-13 10:53:44.000000000 +0100
33@@ -27,6 +27,8 @@
34 #include <libgnomevfs/gnome-vfs.h>
35 #endif
36
37+#include "owlwindowmenu.h"
38+
39 #include "bacon-message-connection.h"
40 #include "contacts-defs.h"
41 #include "contacts-utils.h"
42@@ -230,6 +232,10 @@
43 /* fix icon sizes to 16x16 for the moment... */
44 gtk_rc_parse_string ("gtk_icon_sizes=\"gtk-button=16,16:gtk-menu=16,16\"");
45
46+ gtk_widget_show_all (data->ui->main_menubar);
47+ owl_set_window_menu (GTK_WINDOW (data->ui->main_window),
48+ GTK_MENU (data->ui->main_menubar));
49+
50 gtk_main ();
51
52 /* Unload the addressbook */
diff --git a/meta/packages/pimlico/contacts_0.8.bb b/meta/packages/pimlico/contacts_0.8.bb
index d00752b9c4..fac3dabb23 100644
--- a/meta/packages/pimlico/contacts_0.8.bb
+++ b/meta/packages/pimlico/contacts_0.8.bb
@@ -6,4 +6,5 @@ SRC_URI = "http://pimlico-project.org/sources/${PN}/${PN}-${PV}.tar.gz \
6 file://stock_contact.png \ 6 file://stock_contact.png \
7 file://stock_person.png \ 7 file://stock_person.png \
8 file://contacts-owl-window-menu.patch;patch=1 \ 8 file://contacts-owl-window-menu.patch;patch=1 \
9 file://contacts-focus-avoidance.patch;patch=1 \
9 " 10 "
diff --git a/meta/packages/pimlico/files/contacts-focus-avoidance.patch b/meta/packages/pimlico/files/contacts-focus-avoidance.patch
new file mode 100644
index 0000000000..77aae90d53
--- /dev/null
+++ b/meta/packages/pimlico/files/contacts-focus-avoidance.patch
@@ -0,0 +1,36 @@
1Index: src/contacts-gtk.c
2===================================================================
3--- src/contacts-gtk.c (revision 405)
4+++ src/contacts-gtk.c (working copy)
5@@ -426,7 +426,6 @@
6 GTK_WIDGET_SET_FLAGS (edit_done_button, GTK_CAN_DEFAULT);
7
8
9- gtk_widget_grab_focus (search_entry);
10 gtk_widget_grab_default (edit_button);
11 gtk_window_add_accel_group (GTK_WINDOW (main_window), accel_group);
12
13@@ -436,8 +435,9 @@
14 gtk_size_group_add_widget (size_group, summary_hbuttonbox);
15 g_object_unref (size_group);
16
17+ /* Set it so no focus on the search box by default */
18+ gtk_window_set_focus (GTK_WINDOW (main_window), NULL);
19
20-
21 /* connect signals */
22 g_signal_connect (G_OBJECT (main_window), "delete-event",
23 G_CALLBACK (contacts_main_window_delete_event_cb), data);
24Index: src/contacts-edit-pane.c
25===================================================================
26--- src/contacts-edit-pane.c (revision 405)
27+++ src/contacts-edit-pane.c (working copy)
28@@ -86,7 +86,7 @@
29 if (data->ui->edit_button)
30 gtk_window_set_default (window, data->ui->edit_button);
31 if ((widget = data->ui->search_entry) && GTK_WIDGET_VISIBLE (widget))
32- gtk_window_set_focus (window, data->ui->search_entry);
33+ gtk_window_set_focus (window, NULL);
34 }
35
36 static void