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

Subscribers

People subscribed via source and target branches

to all changes: