Ubuntu
couchdb-glib package

Merge lp:~rodrigo-moya/ubuntu/natty/couchdb-glib/remove-warnings into lp:~ubuntu-desktop/couchdb-glib/ubuntu

  1. Natty (11.04)
  2. remove-warnings
  3. Merge into ubuntu
Proposed by Rodrigo Moya
Status: Merged
Merged at revision: 30
Proposed branch: lp:~rodrigo-moya/ubuntu/natty/couchdb-glib/remove-warnings
Merge into: lp:~ubuntu-desktop/couchdb-glib/ubuntu
Diff against target: 160 lines (+131/-0)
4 files modified
debian/changelog (+7/-0)
debian/patches/01_remove_useless_warnings.patch (+122/-0)
debian/patches/series (+1/-0)
debian/rules (+1/-0)
To merge this branch: bzr merge lp:~rodrigo-moya/ubuntu/natty/couchdb-glib/remove-warnings
Reviewer Review Type Date Requested Status
Ubuntu Desktop Pending
Review via email: mp+58453@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2011-04-06 15:44:20 +0000
+++ debian/changelog 2011-04-20 08:45:56 +0000
@@ -1,3 +1,10 @@
1couchdb-glib (0.7.2-0ubuntu3) natty; urgency=low
2
3 * debian/patches/01_remove_useless_warnings.patch:
4 - Add upstream patch to remove useless warnings
5
6 -- Rodrigo Moya <rodrigo.moya@canonical.com> Wed, 20 Apr 2011 10:36:17 +0200
7
1couchdb-glib (0.7.2-0ubuntu2) natty; urgency=low8couchdb-glib (0.7.2-0ubuntu2) natty; urgency=low
29
3 * debian/rules:10 * debian/rules:
411
=== added directory 'debian/patches'
=== added file 'debian/patches/01_remove_useless_warnings.patch'
--- debian/patches/01_remove_useless_warnings.patch 1970-01-01 00:00:00 +0000
+++ debian/patches/01_remove_useless_warnings.patch 2011-04-20 08:45:56 +0000
@@ -0,0 +1,122 @@
1From f8765589465b16610e73fb37906716bade83efe6 Mon Sep 17 00:00:00 2001
2From: Rodrigo Moya <rodrigo@gnome-db.org>
3Date: Wed, 06 Apr 2011 11:48:38 +0000
4Subject: Check existence of fields before trying to get them from json_object_* to avoid warnings
5
6---
7diff --git a/couchdb-glib/couchdb-document-contact.c b/couchdb-glib/couchdb-document-contact.c
8index b62a93d..a23c28f 100644
9--- a/couchdb-glib/couchdb-document-contact.c
10+++ b/couchdb-glib/couchdb-document-contact.c
11@@ -371,12 +371,15 @@ couchdb_document_contact_get_email_addresses (CouchdbDocumentContact *document)
12 g_return_val_if_fail (COUCHDB_IS_DOCUMENT_CONTACT (document), NULL);
13 g_return_val_if_fail (couchdb_document_is_contact (COUCHDB_DOCUMENT (document)), NULL);
14
15- addresses_json = json_object_get_object_member (
16- couchdb_document_get_json_object (COUCHDB_DOCUMENT (document)), "email_addresses");;
17- if (addresses_json) {
18- json_object_foreach_member (addresses_json,
19- (JsonObjectForeach) foreach_object_cb,
20- &list);
21+ if (json_object_has_member (couchdb_document_get_json_object (COUCHDB_DOCUMENT (document)),
22+ "email_addresses")) {
23+ addresses_json = json_object_get_object_member (
24+ couchdb_document_get_json_object (COUCHDB_DOCUMENT (document)), "email_addresses");;
25+ if (addresses_json) {
26+ json_object_foreach_member (addresses_json,
27+ (JsonObjectForeach) foreach_object_cb,
28+ &list);
29+ }
30 }
31
32 return list;
33@@ -424,12 +427,15 @@ couchdb_document_contact_get_phone_numbers (CouchdbDocumentContact *document)
34 g_return_val_if_fail (COUCHDB_IS_DOCUMENT_CONTACT (document), NULL);
35 g_return_val_if_fail (couchdb_document_is_contact (COUCHDB_DOCUMENT (document)), NULL);
36
37- phone_numbers = json_object_get_object_member (
38- couchdb_document_get_json_object (COUCHDB_DOCUMENT (document)), "phone_numbers");
39- if (phone_numbers) {
40- json_object_foreach_member (phone_numbers,
41- (JsonObjectForeach) foreach_object_cb,
42- &list);
43+ if (json_object_has_member (couchdb_document_get_json_object (COUCHDB_DOCUMENT (document)),
44+ "phone_numbers")) {
45+ phone_numbers = json_object_get_object_member (
46+ couchdb_document_get_json_object (COUCHDB_DOCUMENT (document)), "phone_numbers");
47+ if (phone_numbers) {
48+ json_object_foreach_member (phone_numbers,
49+ (JsonObjectForeach) foreach_object_cb,
50+ &list);
51+ }
52 }
53
54 return list;
55@@ -478,12 +484,15 @@ couchdb_document_contact_get_addresses (CouchdbDocumentContact *document)
56 g_return_val_if_fail (COUCHDB_IS_DOCUMENT_CONTACT (document), NULL);
57 g_return_val_if_fail (couchdb_document_is_contact (COUCHDB_DOCUMENT (document)), NULL);
58
59- addresses = json_object_get_object_member (
60- couchdb_document_get_json_object (COUCHDB_DOCUMENT (document)), "addresses");
61- if (addresses) {
62- json_object_foreach_member (addresses,
63- (JsonObjectForeach) foreach_object_cb,
64- &list);
65+ if (json_object_has_member (couchdb_document_get_json_object (COUCHDB_DOCUMENT (document)),
66+ "addresses")) {
67+ addresses = json_object_get_object_member (
68+ couchdb_document_get_json_object (COUCHDB_DOCUMENT (document)), "addresses");
69+ if (addresses) {
70+ json_object_foreach_member (addresses,
71+ (JsonObjectForeach) foreach_object_cb,
72+ &list);
73+ }
74 }
75
76 return list;
77@@ -543,12 +552,15 @@ couchdb_document_contact_get_im_addresses (CouchdbDocumentContact *document)
78 g_return_val_if_fail (COUCHDB_IS_DOCUMENT_CONTACT (document), NULL);
79 g_return_val_if_fail (couchdb_document_is_contact (COUCHDB_DOCUMENT (document)), NULL);
80
81- im_addresses = json_object_get_object_member (
82- couchdb_document_get_json_object (COUCHDB_DOCUMENT (document)), "im_addresses");
83- if (im_addresses != NULL) {
84- json_object_foreach_member (im_addresses,
85- (JsonObjectForeach) foreach_object_cb,
86- &list);
87+ if (json_object_has_member (couchdb_document_get_json_object (COUCHDB_DOCUMENT (document)),
88+ "im_addresses")) {
89+ im_addresses = json_object_get_object_member (
90+ couchdb_document_get_json_object (COUCHDB_DOCUMENT (document)), "im_addresses");
91+ if (im_addresses != NULL) {
92+ json_object_foreach_member (im_addresses,
93+ (JsonObjectForeach) foreach_object_cb,
94+ &list);
95+ }
96 }
97
98 return list;
99@@ -597,12 +609,15 @@ couchdb_document_contact_get_urls (CouchdbDocumentContact *document)
100 g_return_val_if_fail (COUCHDB_IS_DOCUMENT_CONTACT (document), NULL);
101 g_return_val_if_fail (couchdb_document_is_contact (COUCHDB_DOCUMENT (document)), NULL);
102
103- urls = json_object_get_object_member (
104- couchdb_document_get_json_object (COUCHDB_DOCUMENT (document)), "urls");
105- if (urls) {
106- json_object_foreach_member (urls,
107- (JsonObjectForeach) foreach_object_cb,
108- &list);
109+ if (json_object_has_member (couchdb_document_get_json_object (COUCHDB_DOCUMENT (document)),
110+ "urls")) {
111+ urls = json_object_get_object_member (
112+ couchdb_document_get_json_object (COUCHDB_DOCUMENT (document)), "urls");
113+ if (urls) {
114+ json_object_foreach_member (urls,
115+ (JsonObjectForeach) foreach_object_cb,
116+ &list);
117+ }
118 }
119
120 return list;
121--
122cgit v0.9
0123
=== added file 'debian/patches/series'
--- debian/patches/series 1970-01-01 00:00:00 +0000
+++ debian/patches/series 2011-04-20 08:45:56 +0000
@@ -0,0 +1,1 @@
101_remove_useless_warnings.patch
02
=== modified file 'debian/rules'
--- debian/rules 2011-04-06 15:44:20 +0000
+++ debian/rules 2011-04-20 08:45:56 +0000
@@ -1,6 +1,7 @@
1#! /usr/bin/make -f1#! /usr/bin/make -f
22
3include /usr/share/cdbs/1/rules/debhelper.mk3include /usr/share/cdbs/1/rules/debhelper.mk
4include /usr/share/cdbs/1/rules/simple-patchsys.mk
4include /usr/share/cdbs/1/class/gnome.mk5include /usr/share/cdbs/1/class/gnome.mk
56
6DEB_CONFIGURE_EXTRA_FLAGS := --enable-gtk-doc --enable-introspection=yes7DEB_CONFIGURE_EXTRA_FLAGS := --enable-gtk-doc --enable-introspection=yes

Subscribers

People subscribed via source and target branches

to all changes: