summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2008-06-16 07:25:20 +0000
committerRoss Burton <ross@openedhand.com>2008-06-16 07:25:20 +0000
commit4f44cc153d5492bbb461b8e30910613dd2f116f1 (patch)
tree69d98b26a10bc1785faa66a0a3b8cfe7cd498772 /meta
parent5b6fb58329b544bf6e6b6f18f166292b86d85afe (diff)
downloadpoky-4f44cc153d5492bbb461b8e30910613dd2f116f1.tar.gz
contacts: update to 0.9 and refresh patches
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4658 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/pimlico/contacts_0.9.bb (renamed from meta/packages/pimlico/contacts_0.8.bb)3
-rw-r--r--meta/packages/pimlico/contacts_svn.bb3
-rw-r--r--meta/packages/pimlico/files/contacts-focus-avoidance.patch36
-rw-r--r--meta/packages/pimlico/files/contacts-owl-window-menu.patch34
4 files changed, 19 insertions, 57 deletions
diff --git a/meta/packages/pimlico/contacts_0.8.bb b/meta/packages/pimlico/contacts_0.9.bb
index ba2cb1e3c3..d3ecf29ce8 100644
--- a/meta/packages/pimlico/contacts_0.8.bb
+++ b/meta/packages/pimlico/contacts_0.9.bb
@@ -1,10 +1,9 @@
1require contacts.inc 1require contacts.inc
2 2
3PR="r2" 3PR="r0"
4 4
5SRC_URI = "http://pimlico-project.org/sources/${PN}/${PN}-${PV}.tar.gz \ 5SRC_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 \
10 " 9 "
diff --git a/meta/packages/pimlico/contacts_svn.bb b/meta/packages/pimlico/contacts_svn.bb
index 948f56521a..e9389b51f0 100644
--- a/meta/packages/pimlico/contacts_svn.bb
+++ b/meta/packages/pimlico/contacts_svn.bb
@@ -4,7 +4,7 @@ require contacts.inc
4#RDEPENDS += "gnome-vfs-plugin-file" 4#RDEPENDS += "gnome-vfs-plugin-file"
5#RRECOMMENDS += "gnome-vfs-plugin-http" 5#RRECOMMENDS += "gnome-vfs-plugin-http"
6 6
7PV = "0.8+svnr${SRCREV}" 7PV = "0.9+svnr${SRCREV}"
8 8
9DEFAULT_PREFERENCE = "-1" 9DEFAULT_PREFERENCE = "-1"
10 10
@@ -12,7 +12,6 @@ SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \
12 file://stock_contact.png \ 12 file://stock_contact.png \
13 file://stock_person.png \ 13 file://stock_person.png \
14 file://contacts-owl-window-menu.patch;patch=1 \ 14 file://contacts-owl-window-menu.patch;patch=1 \
15 file://contacts-focus-avoidance.patch;patch=1 \
16 " 15 "
17 16
18S = "${WORKDIR}/trunk" 17S = "${WORKDIR}/trunk"
diff --git a/meta/packages/pimlico/files/contacts-focus-avoidance.patch b/meta/packages/pimlico/files/contacts-focus-avoidance.patch
deleted file mode 100644
index 8795b138be..0000000000
--- a/meta/packages/pimlico/files/contacts-focus-avoidance.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1Index: src/contacts-gtk.c
2===================================================================
3--- a/src/contacts-gtk.c (revision 405)
4+++ b/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--- a/src/contacts-edit-pane.c (revision 405)
27+++ b/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
diff --git a/meta/packages/pimlico/files/contacts-owl-window-menu.patch b/meta/packages/pimlico/files/contacts-owl-window-menu.patch
index ad5e2f04fc..ff201b8321 100644
--- a/meta/packages/pimlico/files/contacts-owl-window-menu.patch
+++ b/meta/packages/pimlico/files/contacts-owl-window-menu.patch
@@ -1,8 +1,8 @@
1Index: trunk/src/contacts-gtk.c 1Index: contacts-0.9/src/contacts-gtk.c
2=================================================================== 2===================================================================
3--- trunk.orig/src/contacts-gtk.c 2007-07-11 22:16:08.000000000 +0100 3--- contacts-0.9.orig/src/contacts-gtk.c 2008-06-06 12:56:08.000000000 +0100
4+++ trunk/src/contacts-gtk.c 2007-07-13 09:02:03.000000000 +0100 4+++ contacts-0.9/src/contacts-gtk.c 2008-06-16 08:14:28.000000000 +0100
5@@ -179,8 +179,8 @@ 5@@ -220,8 +220,8 @@
6 vbox7 = gtk_vbox_new (FALSE, 0); 6 vbox7 = gtk_vbox_new (FALSE, 0);
7 gtk_container_add (GTK_CONTAINER (main_window), vbox7); 7 gtk_container_add (GTK_CONTAINER (main_window), vbox7);
8 8
@@ -11,25 +11,25 @@ Index: trunk/src/contacts-gtk.c
11+ main_menubar = gtk_menu_new (); 11+ main_menubar = gtk_menu_new ();
12+ gtk_widget_show (main_menubar); 12+ gtk_widget_show (main_menubar);
13 13
14 contacts_menu = gtk_menu_item_new_with_mnemonic (_("_Contacts")); 14 contacts_menu = gtk_menu_item_new_with_mnemonic (_("C_ontacts"));
15 gtk_container_add (GTK_CONTAINER (main_menubar), contacts_menu); 15 gtk_container_add (GTK_CONTAINER (main_menubar), contacts_menu);
16Index: trunk/src/Makefile.am 16Index: contacts-0.9/src/Makefile.am
17=================================================================== 17===================================================================
18--- trunk.orig/src/Makefile.am 2007-04-19 15:41:14.000000000 +0100 18--- contacts-0.9.orig/src/Makefile.am 2008-06-03 09:16:56.000000000 +0100
19+++ trunk/src/Makefile.am 2007-07-13 08:50:58.000000000 +0100 19+++ contacts-0.9/src/Makefile.am 2008-06-16 08:15:34.000000000 +0100
20@@ -28,7 +28,7 @@ 20@@ -40,7 +40,7 @@
21 contacts-@FRONTEND@.c \ 21 contacts-@FRONTEND@.c \
22 contacts-@FRONTEND@.h 22 contacts-@FRONTEND@.h
23 23
24-contacts_LDADD = $(CONTACTS_LIBS) 24-contacts_LDADD = $(CONTACTS_LIBS) $(DBUS_LIBS)
25+contacts_LDADD = $(CONTACTS_LIBS) -lowl 25+contacts_LDADD = $(CONTACTS_LIBS) $(DBUS_LIBS) -lowl
26 contacts_LDFLAGS = @CONTACTS_LIBS@
27 26
28 MAINTAINERCLEANFILES = config.h.in Makefile.in 27 contacts_LDFLAGS = @CONTACTS_LIBS@ @DBUS_LIBS@
29Index: trunk/src/contacts-main.c 28
29Index: contacts-0.9/src/contacts-main.c
30=================================================================== 30===================================================================
31--- trunk.orig/src/contacts-main.c 2007-07-11 22:16:08.000000000 +0100 31--- contacts-0.9.orig/src/contacts-main.c 2008-06-06 10:26:52.000000000 +0100
32+++ trunk/src/contacts-main.c 2007-07-13 09:02:30.000000000 +0100 32+++ contacts-0.9/src/contacts-main.c 2008-06-16 08:14:28.000000000 +0100
33@@ -27,6 +27,8 @@ 33@@ -27,6 +27,8 @@
34 #include <libgnomevfs/gnome-vfs.h> 34 #include <libgnomevfs/gnome-vfs.h>
35 #endif 35 #endif
@@ -39,7 +39,7 @@ Index: trunk/src/contacts-main.c
39 #include "bacon-message-connection.h" 39 #include "bacon-message-connection.h"
40 #include "contacts-defs.h" 40 #include "contacts-defs.h"
41 #include "contacts-utils.h" 41 #include "contacts-utils.h"
42@@ -222,6 +224,10 @@ 42@@ -266,6 +268,10 @@
43 gtk_widget_show_all (widget); 43 gtk_widget_show_all (widget);
44 } 44 }
45 45