1 |
commit: 15fb054c33a22dedc4273639675133263794302d |
2 |
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun May 27 22:21:01 2018 +0000 |
4 |
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun May 27 22:31:01 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=15fb054c |
7 |
|
8 |
app-mobilephone/gnome-phone-manager: removed from gentoo repository |
9 |
|
10 |
...dapt-to-Evolution-Data-Server-API-changes.patch | 541 --------------------- |
11 |
.../gnome-phone-manager-9999.ebuild | 61 --- |
12 |
app-mobilephone/gnome-phone-manager/metadata.xml | 18 - |
13 |
3 files changed, 620 deletions(-) |
14 |
|
15 |
diff --git a/app-mobilephone/gnome-phone-manager/files/0001-Adapt-to-Evolution-Data-Server-API-changes.patch b/app-mobilephone/gnome-phone-manager/files/0001-Adapt-to-Evolution-Data-Server-API-changes.patch |
16 |
deleted file mode 100644 |
17 |
index b375b8f0..00000000 |
18 |
--- a/app-mobilephone/gnome-phone-manager/files/0001-Adapt-to-Evolution-Data-Server-API-changes.patch |
19 |
+++ /dev/null |
20 |
@@ -1,541 +0,0 @@ |
21 |
-From 091f0e00bae058d384fbc9834a402192bbf192a6 Mon Sep 17 00:00:00 2001 |
22 |
-From: Matthew Barnes <mbarnes@××××××.com> |
23 |
-Date: Sat, 29 Dec 2012 21:14:51 +0100 |
24 |
-Subject: [PATCH] Adapt to Evolution-Data-Server API changes |
25 |
- |
26 |
- Closes: https://bugzilla.gnome.org/show_bug.cgi?id=680927 |
27 |
---- |
28 |
- configure.in | 2 +- |
29 |
- cut-n-paste/e-contact-entry/e-contact-entry.c | 168 +++++++++++--------------- |
30 |
- cut-n-paste/e-contact-entry/e-contact-entry.h | 8 +- |
31 |
- libgsm/phonemgr-utils.c | 2 +- |
32 |
- src/e-phone-entry.c | 38 +++--- |
33 |
- 5 files changed, 96 insertions(+), 122 deletions(-) |
34 |
- |
35 |
-diff --git a/configure.in b/configure.in |
36 |
-index be5e729..73e7aec 100644 |
37 |
---- a/configure.in |
38 |
-+++ b/configure.in |
39 |
-@@ -47,7 +47,7 @@ PKG_CHECK_MODULES(LIBGSM, glib-2.0 gobject-2.0 $GNOKII_REQS gthread-2.0 bluez $e |
40 |
- |
41 |
- PKG_CHECK_MODULES(PHONEMGR, gtk+-3.0 >= 3.0 glib-2.0 >= 2.31.0 |
42 |
- libcanberra-gtk3 gconf-2.0 |
43 |
-- $GNOME_BLUETOOTH_REQS $evo_pc_file libedataserverui-3.0 |
44 |
-+ $GNOME_BLUETOOTH_REQS $evo_pc_file libedataserver-1.2 >= 3.6 |
45 |
- gmodule-2.0 dbus-glib-1 gnome-icon-theme >= 2.19.1 |
46 |
- ) |
47 |
- |
48 |
-diff --git a/cut-n-paste/e-contact-entry/e-contact-entry.c b/cut-n-paste/e-contact-entry/e-contact-entry.c |
49 |
-index dc8e2e3..bbd4e6a 100644 |
50 |
---- a/cut-n-paste/e-contact-entry/e-contact-entry.c |
51 |
-+++ b/cut-n-paste/e-contact-entry/e-contact-entry.c |
52 |
-@@ -1,4 +1,4 @@ |
53 |
--/* |
54 |
-+/* |
55 |
- * Copyright (C) 2004 Ross Burton <ross@×××××××××.com |
56 |
- * |
57 |
- * e-contact-entry.c |
58 |
-@@ -38,11 +38,6 @@ |
59 |
- #include <glib.h> |
60 |
- #include <glib/gi18n.h> |
61 |
- |
62 |
--#include <libedataserver/e-source.h> |
63 |
--#include <libebook/e-book.h> |
64 |
--#include <libebook/e-book-view.h> |
65 |
--#include <libebook/e-contact.h> |
66 |
-- |
67 |
- #include "e-contact-entry.h" |
68 |
- #include "econtactentry-marshal.h" |
69 |
- |
70 |
-@@ -59,7 +54,7 @@ static int signals[LAST_SIGNAL] = { 0 }; |
71 |
- /* Properties */ |
72 |
- enum { |
73 |
- PROP_0, /* TODO: why? */ |
74 |
-- PROP_SOURCE_LIST, |
75 |
-+ PROP_REGISTRY, |
76 |
- PROP_COMPLETE_LENGTH, |
77 |
- }; |
78 |
- |
79 |
-@@ -70,7 +65,7 @@ enum { |
80 |
- struct EContactEntryPriv { |
81 |
- GtkEntryCompletion *completion; |
82 |
- GtkListStore *store; |
83 |
-- ESourceList *source_list; |
84 |
-+ ESourceRegistry *registry; |
85 |
- /* A list of EntryLookup structs we are searching */ |
86 |
- GList *lookup_entries; |
87 |
- /* Number of characters to start searching at */ |
88 |
-@@ -227,7 +222,7 @@ e_contact_entry_display_func (EContact *contact) |
89 |
- emails = e_contact_get (contact, E_CONTACT_EMAIL); |
90 |
- for (l = emails; l != NULL; l = l->next) { |
91 |
- item = g_new0 (EContactEntyItem, 1); |
92 |
-- item->identifier = item->identifier = g_strdup (l->data); |
93 |
-+ item->identifier = g_strdup (l->data); |
94 |
- item->display_string = g_strdup_printf ("%s <%s>", (char*)e_contact_get_const (contact, E_CONTACT_NAME_OR_ORG), item->identifier); |
95 |
- |
96 |
- items = g_list_prepend (items, item); |
97 |
-@@ -276,22 +271,13 @@ view_contacts_added_cb (EBook *book, GList *contacts, gpointer user_data) |
98 |
- return; |
99 |
- |
100 |
- photo = e_contact_get (contact, E_CONTACT_PHOTO); |
101 |
--#ifndef HAVE_ECONTACTPHOTOTYPE |
102 |
-- if (photo) { |
103 |
--#else |
104 |
- if (photo && photo->type == E_CONTACT_PHOTO_TYPE_INLINED) { |
105 |
--#endif |
106 |
- GdkPixbufLoader *loader; |
107 |
- |
108 |
- loader = gdk_pixbuf_loader_new (); |
109 |
- |
110 |
--#ifndef HAVE_ECONTACTPHOTOTYPE |
111 |
-- if (gdk_pixbuf_loader_write (loader, (guchar *)photo->data, |
112 |
-- photo->length, NULL)) |
113 |
--#else |
114 |
- if (gdk_pixbuf_loader_write (loader, (guchar *)photo->data.inlined.data, |
115 |
- photo->data.inlined.length, NULL)) |
116 |
--#endif |
117 |
- pixbuf = gdk_pixbuf_loader_get_pixbuf (loader); |
118 |
- |
119 |
- if (pixbuf) { |
120 |
-@@ -339,16 +325,15 @@ view_contacts_added_cb (EBook *book, GList *contacts, gpointer user_data) |
121 |
- * The query on the EBookView has completed. |
122 |
- */ |
123 |
- static void |
124 |
--view_completed_cb (EBookView *book_view, EBookViewStatus status, gpointer user_data) |
125 |
-+view_completed_cb (EBookView *book_view, EBookViewStatus status, const gchar *message, gpointer user_data) |
126 |
- { |
127 |
- EntryLookup *lookup; |
128 |
- g_return_if_fail (user_data != NULL); |
129 |
-- /* TODO: handle status != OK */ |
130 |
-- g_return_if_fail (status == E_BOOK_ERROR_OK); |
131 |
- g_return_if_fail (book_view != NULL); |
132 |
- |
133 |
- lookup = (EntryLookup*)user_data; |
134 |
- g_object_unref (lookup->bookview); |
135 |
-+ lookup->bookview = NULL; |
136 |
- } |
137 |
- |
138 |
- /** |
139 |
-@@ -361,9 +346,9 @@ bookview_cb (EBook *book, EBookStatus status, EBookView *book_view, gpointer clo |
140 |
- /* TODO: handle status != OK */ |
141 |
- g_return_if_fail (status == E_BOOK_ERROR_OK); |
142 |
- g_return_if_fail (closure != NULL); |
143 |
-- |
144 |
-+ |
145 |
- lookup = (EntryLookup*)closure; |
146 |
-- |
147 |
-+ |
148 |
- g_object_ref (book_view); |
149 |
- /* This shouldn't happen of course */ |
150 |
- if (lookup->bookview) { |
151 |
-@@ -372,10 +357,10 @@ bookview_cb (EBook *book, EBookStatus status, EBookView *book_view, gpointer clo |
152 |
- } |
153 |
- lookup->bookview = book_view; |
154 |
- g_object_add_weak_pointer ((GObject*)book_view, (gpointer*)&lookup->bookview); |
155 |
-- |
156 |
-- g_signal_connect (book_view, "contacts_added", (GCallback)view_contacts_added_cb, lookup); |
157 |
-- g_signal_connect (book_view, "sequence_complete", (GCallback)view_completed_cb, lookup); |
158 |
-- |
159 |
-+ |
160 |
-+ g_signal_connect (book_view, "contacts-added", (GCallback)view_contacts_added_cb, lookup); |
161 |
-+ g_signal_connect (book_view, "view_complete", (GCallback)view_completed_cb, lookup); |
162 |
-+ |
163 |
- e_book_view_start (book_view); |
164 |
- } |
165 |
- |
166 |
-@@ -396,9 +381,10 @@ entry_changed_cb (GtkEditable *editable, gpointer user_data) |
167 |
- if (lookup->bookview) { |
168 |
- e_book_view_stop (lookup->bookview); |
169 |
- g_object_unref (lookup->bookview); |
170 |
-+ lookup->bookview = NULL; |
171 |
- } |
172 |
- } |
173 |
-- |
174 |
-+ |
175 |
- gtk_list_store_clear (entry->priv->store); |
176 |
- |
177 |
- query = create_query (entry, gtk_editable_get_chars (editable, 0, -1)); |
178 |
-@@ -409,8 +395,8 @@ entry_changed_cb (GtkEditable *editable, gpointer user_data) |
179 |
- /* If the book isn't open yet, skip this source */ |
180 |
- if (!lookup->open) |
181 |
- continue; |
182 |
-- |
183 |
-- if (e_book_async_get_book_view (lookup->book, query, NULL, 11, (EBookBookViewCallback)bookview_cb, lookup) != 0) { |
184 |
-+ |
185 |
-+ if (e_book_async_get_book_view (lookup->book, query, NULL, MAX_ENTRIES, (EBookBookViewCallback)bookview_cb, lookup) == FALSE) { |
186 |
- g_signal_emit (entry, signals[ERROR], 0, _("Cannot create searchable view.")); |
187 |
- } |
188 |
- } |
189 |
-@@ -441,7 +427,7 @@ book_opened_cb (EBook *book, EBookStatus status, gpointer data) |
190 |
- return; |
191 |
- } |
192 |
- } |
193 |
-- |
194 |
-+ |
195 |
- g_signal_emit (lookup->entry, signals[STATE_CHANGE], 0, FALSE); |
196 |
- g_signal_emit (lookup->entry, signals[ERROR], 0, stringify_ebook_error (status)); |
197 |
- return; |
198 |
-@@ -458,11 +444,12 @@ book_opened_cb (EBook *book, EBookStatus status, gpointer data) |
199 |
- */ |
200 |
- |
201 |
- void |
202 |
--e_contact_entry_set_source_list (EContactEntry *entry, |
203 |
-- ESourceList *source_list) |
204 |
-+e_contact_entry_set_registry (EContactEntry *entry, |
205 |
-+ ESourceRegistry *registry) |
206 |
- { |
207 |
-+ GList *list, *link; |
208 |
-+ const gchar *extension_name; |
209 |
- GError *error = NULL; |
210 |
-- GSList *list, *l; |
211 |
- |
212 |
- g_return_if_fail (E_IS_CONTACT_ENTRY (entry)); |
213 |
- |
214 |
-@@ -471,58 +458,48 @@ e_contact_entry_set_source_list (EContactEntry *entry, |
215 |
- g_list_foreach (entry->priv->lookup_entries, (GFunc)lookup_entry_free, NULL); |
216 |
- g_list_free (entry->priv->lookup_entries); |
217 |
- } |
218 |
-- if (entry->priv->source_list) { |
219 |
-- g_object_unref (entry->priv->source_list); |
220 |
-+ if (entry->priv->registry) { |
221 |
-+ g_object_unref (entry->priv->registry); |
222 |
- } |
223 |
- |
224 |
- /* If we have no new sources, disable and return here */ |
225 |
-- if (source_list == NULL) { |
226 |
-+ if (registry == NULL) { |
227 |
- g_signal_emit (entry, signals[STATE_CHANGE], 0, FALSE); |
228 |
-- entry->priv->source_list = NULL; |
229 |
-+ entry->priv->registry = NULL; |
230 |
- entry->priv->lookup_entries = NULL; |
231 |
- return; |
232 |
- } |
233 |
- |
234 |
-- entry->priv->source_list = source_list; |
235 |
-- /* So that the list isn't going away underneath us */ |
236 |
-- g_object_ref (entry->priv->source_list); |
237 |
-+ entry->priv->registry = registry; |
238 |
-+ /* So that the registry isn't going away underneath us */ |
239 |
-+ g_object_ref (entry->priv->registry); |
240 |
- |
241 |
-- /* That gets us a list of ESourceGroup */ |
242 |
-- list = e_source_list_peek_groups (source_list); |
243 |
- entry->priv->lookup_entries = NULL; |
244 |
- |
245 |
-- for (l = list; l != NULL; l = l->next) { |
246 |
-- ESourceGroup *group = l->data; |
247 |
-- GSList *sources = NULL, *m; |
248 |
-- /* That should give us a list of ESource */ |
249 |
-- sources = e_source_group_peek_sources (group); |
250 |
-- for (m = sources; m != NULL; m = m->next) { |
251 |
-- ESource *source = m->data; |
252 |
-- ESource *s = e_source_copy (source); |
253 |
-- EntryLookup *lookup; |
254 |
-- char *uri; |
255 |
-+ extension_name = E_SOURCE_EXTENSION_ADDRESS_BOOK; |
256 |
-+ list = e_source_registry_list_sources (registry, extension_name); |
257 |
- |
258 |
-- uri = g_strdup_printf("%s/%s", e_source_group_peek_base_uri (group), e_source_peek_relative_uri (source)); |
259 |
-- e_source_set_absolute_uri (s, uri); |
260 |
-- g_free (uri); |
261 |
-+ for (link = list; link != NULL; link = g_list_next (link)) { |
262 |
-+ ESource *source = E_SOURCE (link->data); |
263 |
-+ EntryLookup *lookup; |
264 |
- |
265 |
-- /* Now add those to the lookup entries list */ |
266 |
-- lookup = g_new0 (EntryLookup, 1); |
267 |
-- lookup->entry = entry; |
268 |
-- lookup->status = E_BOOK_ERROR_OK; |
269 |
-- lookup->open = FALSE; |
270 |
-+ /* Now add those to the lookup entries list */ |
271 |
-+ lookup = g_new0 (EntryLookup, 1); |
272 |
-+ lookup->entry = entry; |
273 |
-+ lookup->status = E_BOOK_ERROR_OK; |
274 |
-+ lookup->open = FALSE; |
275 |
- |
276 |
-- if ((lookup->book = e_book_new (s, &error)) == NULL) { |
277 |
-- /* TODO handle this better, fire the error signal I guess */ |
278 |
-+ if ((lookup->book = e_book_new (source, &error)) == NULL) { |
279 |
-+ /* TODO handle this better, fire the error signal I guess */ |
280 |
-+ if (error) { |
281 |
- g_warning ("%s", error->message); |
282 |
-- g_error_free (error); |
283 |
-- g_free (lookup); |
284 |
-- } else { |
285 |
-- entry->priv->lookup_entries = g_list_append (entry->priv->lookup_entries, lookup); |
286 |
-- e_book_async_open(lookup->book, TRUE, (EBookCallback)book_opened_cb, lookup); |
287 |
-+ g_error_free (error); |
288 |
-+ error = NULL; |
289 |
- } |
290 |
-- |
291 |
-- g_object_unref (s); |
292 |
-+ g_free (lookup); |
293 |
-+ } else { |
294 |
-+ entry->priv->lookup_entries = g_list_append (entry->priv->lookup_entries, lookup); |
295 |
-+ e_book_async_open(lookup->book, TRUE, (EBookCallback)book_opened_cb, lookup); |
296 |
- } |
297 |
- } |
298 |
- |
299 |
-@@ -530,12 +507,12 @@ e_contact_entry_set_source_list (EContactEntry *entry, |
300 |
- g_signal_emit (entry, signals[STATE_CHANGE], 0, FALSE); |
301 |
- } |
302 |
- |
303 |
--ESourceList * |
304 |
--e_contact_entry_get_source_list (EContactEntry *entry) |
305 |
-+ESourceRegistry * |
306 |
-+e_contact_entry_get_registry (EContactEntry *entry) |
307 |
- { |
308 |
- g_return_val_if_fail (E_IS_CONTACT_ENTRY (entry), NULL); |
309 |
- |
310 |
-- return entry->priv->source_list; |
311 |
-+ return entry->priv->registry; |
312 |
- } |
313 |
- |
314 |
- void |
315 |
-@@ -552,7 +529,7 @@ int |
316 |
- e_contact_entry_get_complete_length (EContactEntry *entry) |
317 |
- { |
318 |
- g_return_val_if_fail (E_IS_CONTACT_ENTRY (entry), 3); /* TODO: from paramspec? */ |
319 |
-- |
320 |
-+ |
321 |
- return entry->priv->lookup_length; |
322 |
- } |
323 |
- |
324 |
-@@ -564,7 +541,7 @@ e_contact_entry_set_display_func (EContactEntry *entry, EContactEntryDisplayFunc |
325 |
- if (entry->priv->display_destroy) { |
326 |
- entry->priv->display_destroy (entry->priv->display_func); |
327 |
- } |
328 |
-- |
329 |
-+ |
330 |
- entry->priv->display_func = func; |
331 |
- entry->priv->display_data = func_data; |
332 |
- entry->priv->display_destroy = destroy; |
333 |
-@@ -596,13 +573,13 @@ static void |
334 |
- e_contact_entry_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec) |
335 |
- { |
336 |
- EContactEntry *entry; |
337 |
-- |
338 |
-+ |
339 |
- g_return_if_fail (E_IS_CONTACT_ENTRY (object)); |
340 |
- entry = E_CONTACT_ENTRY (object); |
341 |
-- |
342 |
-+ |
343 |
- switch (property_id) { |
344 |
-- case PROP_SOURCE_LIST: |
345 |
-- e_contact_entry_set_source_list (entry, g_value_get_object (value)); |
346 |
-+ case PROP_REGISTRY: |
347 |
-+ e_contact_entry_set_registry (entry, g_value_get_object (value)); |
348 |
- break; |
349 |
- case PROP_COMPLETE_LENGTH: |
350 |
- e_contact_entry_set_complete_length (entry, g_value_get_int (value)); |
351 |
-@@ -618,10 +595,10 @@ e_contact_entry_get_property (GObject *object, guint property_id, GValue *value, |
352 |
- EContactEntry *entry; |
353 |
- g_return_if_fail (E_IS_CONTACT_ENTRY (object)); |
354 |
- entry = E_CONTACT_ENTRY (object); |
355 |
-- |
356 |
-+ |
357 |
- switch (property_id) { |
358 |
-- case PROP_SOURCE_LIST: |
359 |
-- g_value_set_object (value, e_contact_entry_get_source_list (entry)); |
360 |
-+ case PROP_REGISTRY: |
361 |
-+ g_value_set_object (value, e_contact_entry_get_registry (entry)); |
362 |
- break; |
363 |
- case PROP_COMPLETE_LENGTH: |
364 |
- g_value_set_int (value, e_contact_entry_get_complete_length (entry)); |
365 |
-@@ -644,7 +621,7 @@ e_contact_entry_finalize (GObject *object) |
366 |
- g_list_free (entry->priv->lookup_entries); |
367 |
- g_object_unref (entry->priv->completion); |
368 |
- g_object_unref (entry->priv->store); |
369 |
-- g_object_unref (entry->priv->source_list); |
370 |
-+ g_object_unref (entry->priv->registry); |
371 |
- |
372 |
- if (entry->priv->display_destroy) { |
373 |
- entry->priv->display_destroy (entry->priv->display_func); |
374 |
-@@ -657,7 +634,7 @@ e_contact_entry_finalize (GObject *object) |
375 |
- static void |
376 |
- reset_search_fields (EContactEntry *entry) |
377 |
- { |
378 |
-- EContactField fields[] = { E_CONTACT_FULL_NAME, E_CONTACT_EMAIL, E_CONTACT_NICKNAME, E_CONTACT_ORG, 0 }; |
379 |
-+ EContactField fields[] = { E_CONTACT_FULL_NAME, E_CONTACT_EMAIL, E_CONTACT_NICKNAME, 0 }; |
380 |
- |
381 |
- g_free (entry->priv->search_fields); |
382 |
- entry->priv->search_fields = g_new0 (EContactField, G_N_ELEMENTS (fields)); |
383 |
-@@ -707,23 +684,23 @@ static void |
384 |
- e_contact_entry_class_init (EContactEntryClass *klass) |
385 |
- { |
386 |
- GObjectClass *object_class; |
387 |
-- |
388 |
-+ |
389 |
- object_class = (GObjectClass *) klass; |
390 |
-- |
391 |
-+ |
392 |
- /* GObject */ |
393 |
- object_class->set_property = e_contact_entry_set_property; |
394 |
- object_class->get_property = e_contact_entry_get_property; |
395 |
- object_class->finalize = e_contact_entry_finalize; |
396 |
- |
397 |
- /* Properties */ |
398 |
-- g_object_class_install_property (object_class, PROP_SOURCE_LIST, |
399 |
-- g_param_spec_object ("source-list", "Source List", "The source list to search for contacts.", |
400 |
-- E_TYPE_SOURCE_LIST, G_PARAM_READWRITE)); |
401 |
-- |
402 |
-+ g_object_class_install_property (object_class, PROP_REGISTRY, |
403 |
-+ g_param_spec_object ("registry", "Registry", "Data source registry.", |
404 |
-+ E_TYPE_SOURCE_REGISTRY, G_PARAM_READWRITE)); |
405 |
-+ |
406 |
- g_object_class_install_property (object_class, PROP_COMPLETE_LENGTH, |
407 |
- g_param_spec_int ("complete-length", "Complete length", "Number of characters to start a search on.", |
408 |
- 2, 99, 3, G_PARAM_READWRITE)); |
409 |
-- |
410 |
-+ |
411 |
- /* Signals */ |
412 |
- signals[CONTACT_SELECTED] = g_signal_new ("contact-selected", |
413 |
- G_TYPE_FROM_CLASS (object_class), |
414 |
-@@ -732,7 +709,7 @@ e_contact_entry_class_init (EContactEntryClass *klass) |
415 |
- NULL, NULL, |
416 |
- econtactentry_marshal_VOID__OBJECT_STRING, |
417 |
- G_TYPE_NONE, 2, E_TYPE_CONTACT, G_TYPE_STRING); |
418 |
-- |
419 |
-+ |
420 |
- signals[ERROR] = g_signal_new ("error", |
421 |
- G_TYPE_FROM_CLASS (object_class), |
422 |
- G_SIGNAL_RUN_LAST, |
423 |
-@@ -771,6 +748,7 @@ lookup_entry_free (EntryLookup *lookup) |
424 |
- if (lookup->bookview) { |
425 |
- g_warning("EBookView still around"); |
426 |
- g_object_unref (lookup->bookview); |
427 |
-+ lookup->bookview = NULL; |
428 |
- } |
429 |
- if (lookup->book) { |
430 |
- g_object_unref (lookup->book); |
431 |
-@@ -789,11 +767,11 @@ split_query_string (const gchar *str) |
432 |
- GArray *parts = g_array_sized_new (FALSE, FALSE, sizeof (char *), 2); |
433 |
- PangoLogAttr *attrs; |
434 |
- guint str_len = strlen (str), word_start = 0, i; |
435 |
-- |
436 |
-- attrs = g_new0 (PangoLogAttr, str_len + 1); |
437 |
-+ |
438 |
-+ attrs = g_new0 (PangoLogAttr, str_len + 1); |
439 |
- /* TODO: do we need to specify a particular language or is NULL ok? */ |
440 |
- pango_get_log_attrs (str, -1, -1, NULL, attrs, str_len + 1); |
441 |
-- |
442 |
-+ |
443 |
- for (i = 0; i < str_len + 1; i++) { |
444 |
- char *start_word, *end_word, *word; |
445 |
- if (attrs[i].is_word_end) { |
446 |
-diff --git a/cut-n-paste/e-contact-entry/e-contact-entry.h b/cut-n-paste/e-contact-entry/e-contact-entry.h |
447 |
-index bf6b39b..6fedef7 100644 |
448 |
---- a/cut-n-paste/e-contact-entry/e-contact-entry.h |
449 |
-+++ b/cut-n-paste/e-contact-entry/e-contact-entry.h |
450 |
-@@ -23,10 +23,8 @@ |
451 |
- #ifndef CONTACT_ENTRY_H |
452 |
- #define CONTACT_ENTRY_H |
453 |
- |
454 |
--#include <libedataserver/e-source-group.h> |
455 |
--#include <libedataserver/e-source-list.h> |
456 |
--#include <libebook/e-contact.h> |
457 |
- #include <gtk/gtk.h> |
458 |
-+#include <libebook/libebook.h> |
459 |
- |
460 |
- G_BEGIN_DECLS |
461 |
- |
462 |
-@@ -71,8 +69,8 @@ GType e_contact_entry_get_type (void); |
463 |
- |
464 |
- GtkWidget *e_contact_entry_new (void); |
465 |
- |
466 |
--void e_contact_entry_set_source_list (EContactEntry *entry, ESourceList *list); |
467 |
--ESourceList *e_contact_entry_get_source_list (EContactEntry *entry); |
468 |
-+void e_contact_entry_set_registry (EContactEntry *entry, ESourceRegistry *registry); |
469 |
-+ESourceRegistry *e_contact_entry_get_registry (EContactEntry *entry); |
470 |
- |
471 |
- void e_contact_entry_set_complete_length(EContactEntry *entry, int length); |
472 |
- int e_contact_entry_get_complete_length(EContactEntry *entry); |
473 |
-diff --git a/libgsm/phonemgr-utils.c b/libgsm/phonemgr-utils.c |
474 |
-index 4e62e10..baef34f 100644 |
475 |
---- a/libgsm/phonemgr-utils.c |
476 |
-+++ b/libgsm/phonemgr-utils.c |
477 |
-@@ -27,7 +27,7 @@ |
478 |
- #include <glib.h> |
479 |
- #include <glib/gstdio.h> |
480 |
- #include <glib-object.h> |
481 |
--#include <libebook/e-contact.h> |
482 |
-+#include <libebook/libebook.h> |
483 |
- #include <gnokii.h> |
484 |
- |
485 |
- #include <bluetooth/bluetooth.h> |
486 |
-diff --git a/src/e-phone-entry.c b/src/e-phone-entry.c |
487 |
-index 5d25622..5c10155 100644 |
488 |
---- a/src/e-phone-entry.c |
489 |
-+++ b/src/e-phone-entry.c |
490 |
-@@ -1,5 +1,5 @@ |
491 |
- /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ |
492 |
--/* |
493 |
-+/* |
494 |
- * Copyright (C) 2005 Bastien Nocera <hadess@××××××.net> |
495 |
- * |
496 |
- * e-phone-entry.c |
497 |
-@@ -31,8 +31,6 @@ |
498 |
- |
499 |
- #include <gtk/gtk.h> |
500 |
- #include <string.h> |
501 |
--#include <libedataserver/e-source-list.h> |
502 |
--#include <libedataserverui/e-client-utils.h> |
503 |
- #include "e-phone-entry.h" |
504 |
- |
505 |
- #define CONTACT_FORMAT "%s (%s)" |
506 |
-@@ -181,25 +179,25 @@ e_phone_entry_finalize (GObject *object) |
507 |
- } |
508 |
- |
509 |
- static void |
510 |
--add_sources (EContactEntry *entry) |
511 |
--{ |
512 |
-- ESourceList *source_list; |
513 |
-- |
514 |
-- if (e_client_utils_get_sources (&source_list, |
515 |
-- E_CLIENT_SOURCE_TYPE_CONTACTS, |
516 |
-- NULL)) { |
517 |
-- e_contact_entry_set_source_list (E_CONTACT_ENTRY (entry), |
518 |
-- source_list); |
519 |
-- g_object_unref (source_list); |
520 |
-- } |
521 |
--} |
522 |
-- |
523 |
--static void |
524 |
- e_phone_entry_init (EPhoneEntry *entry) |
525 |
- { |
526 |
- EContactField fields[] = { E_CONTACT_FULL_NAME, E_CONTACT_NICKNAME, E_CONTACT_ORG, E_CONTACT_PHONE_MOBILE, 0 }; |
527 |
-+ ESourceRegistry *registry; |
528 |
-+ GError *error = NULL; |
529 |
-+ |
530 |
-+ /* XXX This call blocks while a D-Bus connection is made, possibly |
531 |
-+ * requiring activation. Might be better to create the registry |
532 |
-+ * in main(), pass it to ui_init(), and have e_phone_entry_new() |
533 |
-+ * take it as an argument. Calling this from main() means if it |
534 |
-+ * fails you can abort cleanly with a console error message. */ |
535 |
-+ registry = e_source_registry_new_sync (NULL, &error); |
536 |
-+ if (registry == NULL) { |
537 |
-+ g_error ("%s: %s", G_STRFUNC, error->message); |
538 |
-+ g_assert_not_reached (); |
539 |
-+ } |
540 |
-+ e_contact_entry_set_registry (E_CONTACT_ENTRY (entry), registry); |
541 |
-+ g_object_unref (registry); |
542 |
- |
543 |
-- add_sources (E_CONTACT_ENTRY (entry)); |
544 |
- e_contact_entry_set_search_fields (E_CONTACT_ENTRY (entry), (const EContactField *)fields); |
545 |
- e_contact_entry_set_display_func (E_CONTACT_ENTRY (entry), test_display_func, NULL, NULL); |
546 |
- g_signal_connect (G_OBJECT (entry), "contact_selected", |
547 |
-@@ -212,9 +210,9 @@ static void |
548 |
- e_phone_entry_class_init (EPhoneEntryClass *klass) |
549 |
- { |
550 |
- GObjectClass *object_class; |
551 |
-- |
552 |
-+ |
553 |
- object_class = (GObjectClass *) klass; |
554 |
-- |
555 |
-+ |
556 |
- /* GObject */ |
557 |
- object_class->finalize = e_phone_entry_finalize; |
558 |
- |
559 |
--- |
560 |
-1.8.0.2 |
561 |
- |
562 |
|
563 |
diff --git a/app-mobilephone/gnome-phone-manager/gnome-phone-manager-9999.ebuild b/app-mobilephone/gnome-phone-manager/gnome-phone-manager-9999.ebuild |
564 |
deleted file mode 100644 |
565 |
index fecd2221..00000000 |
566 |
--- a/app-mobilephone/gnome-phone-manager/gnome-phone-manager-9999.ebuild |
567 |
+++ /dev/null |
568 |
@@ -1,61 +0,0 @@ |
569 |
-# Copyright 1999-2015 Gentoo Foundation |
570 |
-# Distributed under the terms of the GNU General Public License v2 |
571 |
-# $Id$ |
572 |
- |
573 |
-EAPI="5" |
574 |
-GCONF_DEBUG="yes" |
575 |
-GNOME2_LA_PUNT="yes" |
576 |
-GNOME_LIVE_MODULE="phonemgr" |
577 |
- |
578 |
-inherit autotools eutils gnome2 |
579 |
-if [[ ${PV} = 9999 ]]; then |
580 |
- inherit gnome2-live |
581 |
-fi |
582 |
- |
583 |
-DESCRIPTION="A program created to allow you to control aspects of your mobile phone from your GNOME desktop" |
584 |
-HOMEPAGE="http://live.gnome.org/PhoneManager" |
585 |
- |
586 |
-LICENSE="GPL-2" |
587 |
-SLOT="0" |
588 |
-if [[ ${PV} = 9999 ]]; then |
589 |
- KEYWORDS="" |
590 |
-else |
591 |
- KEYWORDS="~amd64 ~ppc ~x86" |
592 |
-fi |
593 |
-IUSE="gnome" |
594 |
-# telepathy support is considered experimental |
595 |
- |
596 |
-RDEPEND=" |
597 |
- >=app-mobilephone/gnokii-0.6.28[bluetooth] |
598 |
- dev-libs/dbus-glib |
599 |
- >=dev-libs/glib-2.31:2 |
600 |
- dev-libs/openobex |
601 |
- >=gnome-base/gconf-2:2 |
602 |
- >=gnome-extra/evolution-data-server-3.6 |
603 |
- media-libs/libcanberra[gtk3] |
604 |
- net-wireless/bluez |
605 |
- >=net-wireless/gnome-bluetooth-3.3:2 |
606 |
- >=x11-themes/gnome-icon-theme-2.19.1 |
607 |
- >=x11-libs/gtk+-3:3 |
608 |
-" |
609 |
-DEPEND="${RDEPEND} |
610 |
- >=dev-util/intltool-0.35.5 |
611 |
- gnome-base/gnome-common |
612 |
- virtual/pkgconfig |
613 |
-" |
614 |
-# gnome-common needed for eautoreconf |
615 |
- |
616 |
-src_prepare() { |
617 |
- # Fix eds-3.6 building, upstream bug #680927 |
618 |
- epatch "${FILESDIR}"/0001-Adapt-to-Evolution-Data-Server-API-changes.patch |
619 |
- |
620 |
- [[ ${PV} != 9999 ]] && eautoreconf |
621 |
- gnome2_src_prepare |
622 |
-} |
623 |
- |
624 |
-src_configure() { |
625 |
- gnome2_src_configure \ |
626 |
- $(use_enable gnome bluetooth-plugin) \ |
627 |
- --disable-telepathy \ |
628 |
- --disable-static |
629 |
-} |
630 |
|
631 |
diff --git a/app-mobilephone/gnome-phone-manager/metadata.xml b/app-mobilephone/gnome-phone-manager/metadata.xml |
632 |
deleted file mode 100644 |
633 |
index ee14c5d6..00000000 |
634 |
--- a/app-mobilephone/gnome-phone-manager/metadata.xml |
635 |
+++ /dev/null |
636 |
@@ -1,18 +0,0 @@ |
637 |
-<?xml version="1.0" encoding="UTF-8"?> |
638 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
639 |
-<pkgmetadata> |
640 |
-<maintainer type="project"> |
641 |
- <email>gnome@g.o</email> |
642 |
- <name>Gentoo GNOME Desktop</name> |
643 |
-</maintainer> |
644 |
-<longdescription>Phone Manager is a program created to allow you to control aspects |
645 |
-of your mobile phone from your GNOME desktop. |
646 |
- |
647 |
-The software is in its early stages right now. Current features include: |
648 |
- * Runs in the background; indicates status on the panel notification area. |
649 |
- * Display on-screen alert when text message (SMS) arrives |
650 |
- * Text message (SMS) sending facility |
651 |
- |
652 |
-Phone Manager supports any mobile phone that can connect to your |
653 |
-computer as a serial port: via Bluetooth, IrDA or a serial cable.</longdescription> |
654 |
-</pkgmetadata> |