Gwibber

Merge lp:~robert-ancell/gwibber/compile-warnings into lp:gwibber

  1. compile-warnings
  2. Merge into trunk
Proposed by Robert Ancell
Status: Merged
Merged at revision: 1259
Proposed branch: lp:~robert-ancell/gwibber/compile-warnings
Merge into: lp:gwibber
Diff against target: 617 lines (+197/-91)
12 files modified
client/gwibber-preferences.vala (+1/-0)
client/stream-entry.vala (+0/-1)
client/tab-bar-widgets.vala (+2/-2)
client/tab-bar.vala (+10/-12)
libgwibber-gtk/action-box.vala (+44/-19)
libgwibber-gtk/entry.vala (+7/-1)
libgwibber-gtk/stream-view-tile.vala (+41/-10)
libgwibber-gtk/user-view-tile.vala (+14/-2)
libgwibber/searches.vala (+2/-2)
libgwibber/service.vala (+3/-6)
libgwibber/streams.vala (+70/-29)
libgwibber/utils.vala (+3/-7)
To merge this branch: bzr merge lp:~robert-ancell/gwibber/compile-warnings
Reviewer Review Type Date Requested Status
Ken VanDine Approve
Review via email: mp+92609@code.launchpad.net

Description of the change

Remove a bunch of compile warnings

To post a comment you must log in.
Revision history for this message
Ken VanDine (ken-vandine) wrote :

Awesome, thanks for cleaning those up!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'client/gwibber-preferences.vala'
2--- client/gwibber-preferences.vala 2012-01-18 14:41:05 +0000
3+++ client/gwibber-preferences.vala 2012-02-11 06:20:27 +0000
4@@ -116,6 +116,7 @@
5
6 var p = new GwibberPreferences ();
7 Gtk.main ();
8+ p = null;
9
10 return 0;
11 }
12
13=== modified file 'client/stream-entry.vala'
14--- client/stream-entry.vala 2012-01-21 04:42:51 +0000
15+++ client/stream-entry.vala 2012-02-11 06:20:27 +0000
16@@ -216,7 +216,6 @@
17 if (in_client)
18 a.height -= 12;
19
20- var r = 4.0f; //radius
21 cr.rectangle (a.x, a.y, a.width, a.height);
22
23 var pat = new Cairo.Pattern.linear (0, 0, 0, _align.get_allocated_height ());
24
25=== modified file 'client/tab-bar-widgets.vala'
26--- client/tab-bar-widgets.vala 2012-01-19 05:30:53 +0000
27+++ client/tab-bar-widgets.vala 2012-02-11 06:20:27 +0000
28@@ -165,7 +165,7 @@
29 public string color { get; construct;}
30 private bool _active;
31
32- public bool active {
33+ public new bool active {
34 get { return _active; }
35 set
36 {
37@@ -350,7 +350,7 @@
38 });
39 accounts_service.deleted.connect((id) => {
40 accounts_buttons_map[id].destroy ();
41- accounts_buttons_map.remove (id);
42+ accounts_buttons_map.unset (id);
43 if (selected == id)
44 selected = null;
45 });
46
47=== modified file 'client/tab-bar.vala'
48--- client/tab-bar.vala 2012-01-30 21:11:38 +0000
49+++ client/tab-bar.vala 2012-02-11 06:20:27 +0000
50@@ -142,20 +142,18 @@
51 cr.set_operator (Cairo.Operator.OVER);
52
53 // Menu background
54- Gtk.render_background (_align.get_style_context (),
55- cr,
56- 0,
57- 0,
58- _align.get_allocated_width (),
59- _align.get_allocated_height ());
60+ _align.get_style_context ().render_background (cr,
61+ 0,
62+ 0,
63+ _align.get_allocated_width (),
64+ _align.get_allocated_height ());
65
66 // Menu frame
67- Gtk.render_frame (_align.get_style_context (),
68- cr,
69- 0,
70- 0,
71- _align.get_allocated_width (),
72- _align.get_allocated_height ());
73+ _align.get_style_context ().render_frame (cr,
74+ 0,
75+ 0,
76+ _align.get_allocated_width (),
77+ _align.get_allocated_height ());
78
79 // Arrow
80 if (_active_item is Gtk.Widget && !_entry.get_visible ())
81
82=== modified file 'libgwibber-gtk/action-box.vala'
83--- libgwibber-gtk/action-box.vala 2012-02-01 20:31:12 +0000
84+++ libgwibber-gtk/action-box.vala 2012-02-11 06:20:27 +0000
85@@ -150,29 +150,30 @@
86 Json.Object obj = null;
87 Json.Object sender_obj = null;
88
89+ var messages = new Gwibber.Messages ();
90+ var msg = messages.get_message (mid);
91+
92+ var parser = new Json.Parser();
93 try
94 {
95- var messages = new Gwibber.Messages ();
96- var msg = messages.get_message (mid);
97-
98- var parser = new Json.Parser();
99 parser.load_from_data(msg);
100+ }
101+ catch (Error e)
102+ {
103+ }
104
105- obj = parser.get_root().get_object();
106- if (obj != null)
107+ obj = parser.get_root().get_object();
108+ if (obj != null)
109+ {
110+ if (obj.has_member ("sender"))
111 {
112- if (obj.has_member ("sender"))
113+ sender_obj = obj.get_object_member ("sender");
114+ if (sender_obj != null)
115 {
116- sender_obj = obj.get_object_member ("sender");
117- if (sender_obj != null)
118- {
119- if (sender_obj.has_member ("nick"))
120- nick = sender_obj.get_string_member ("nick");
121- }
122+ if (sender_obj.has_member ("nick"))
123+ nick = sender_obj.get_string_member ("nick");
124 }
125 }
126- } catch (GLib.IOError e) {
127- warning (e.message);
128 }
129 if (nick.length > 0)
130 nick = "@" + nick;
131@@ -196,7 +197,13 @@
132 var msg = messages.get_message (mid);
133
134 var parser = new Json.Parser();
135- parser.load_from_data(msg);
136+ try
137+ {
138+ parser.load_from_data(msg);
139+ }
140+ catch (Error e)
141+ {
142+ }
143
144 obj = parser.get_root().get_object();
145 if (obj != null)
146@@ -237,7 +244,13 @@
147 var msg = messages.get_message (mid);
148
149 var parser = new Json.Parser();
150- parser.load_from_data(msg);
151+ try
152+ {
153+ parser.load_from_data(msg);
154+ }
155+ catch (Error e)
156+ {
157+ }
158
159 obj = parser.get_root().get_object();
160 if (obj != null)
161@@ -261,7 +274,13 @@
162 nick = name;
163
164 var notification = new Notify.Notification (_("Liked"), _("Liked post from %s").printf (nick), _scalable_icon);
165- notification.show ();
166+ try
167+ {
168+ notification.show ();
169+ }
170+ catch (Error e)
171+ {
172+ }
173 }
174 });
175 _menu.append(_amenu);
176@@ -282,7 +301,13 @@
177 var ret = share (mid, account);
178 if (ret) {
179 var notification = new Notify.Notification (_("Shared"), _("Shared post from %s").printf (sender), _scalable_icon);
180- notification.show ();
181+ try
182+ {
183+ notification.show ();
184+ }
185+ catch (Error e)
186+ {
187+ }
188 }
189 });
190 _menu.append(_amenu);
191
192=== modified file 'libgwibber-gtk/entry.vala'
193--- libgwibber-gtk/entry.vala 2012-01-29 05:46:03 +0000
194+++ libgwibber-gtk/entry.vala 2012-02-11 06:20:27 +0000
195@@ -137,7 +137,13 @@
196 on_connection_changed (source);});
197
198 #if HAVE_GTKSPELL
199- var spell = new Gtk.Spell.attach(this, null);
200+ try
201+ {
202+ var spell = new Gtk.Spell.attach(this, null);
203+ }
204+ catch (Error e)
205+ {
206+ }
207 #endif
208 }
209
210
211=== modified file 'libgwibber-gtk/stream-view-tile.vala'
212--- libgwibber-gtk/stream-view-tile.vala 2012-02-09 09:20:33 +0000
213+++ libgwibber-gtk/stream-view-tile.vala 2012-02-11 06:20:27 +0000
214@@ -81,8 +81,6 @@
215 public Gwibber.Service service { get; construct set; }
216 public bool show_fullname { get; construct set; }
217 private uint _update_time_area_id = 0;
218- private uint _cache_avatar_id = 0;
219- private uint _cache_overlay_avatar_id = 0;
220 private ulong _expander_id = 0;
221 private ulong _thumb_expander_id = 0;
222 private List<ulong> _to_disconnect;
223@@ -228,7 +226,15 @@
224 thumb_box.button_release_event.connect (() =>
225 {
226 if (img_src != null)
227- Gtk.show_uri(Gdk.Screen.get_default(), img_src, 0);
228+ {
229+ try
230+ {
231+ Gtk.show_uri(Gdk.Screen.get_default(), img_src, 0);
232+ }
233+ catch (Error e)
234+ {
235+ }
236+ }
237 return false;
238 });
239
240@@ -253,8 +259,15 @@
241 likes_hbox = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
242 likes_hbox.set_no_show_all (true);
243 // FIXME: Find a theme icon
244- var likes_icon = new Gtk.Image.from_file ("/usr/share/gwibber/ui/icons/streams/16x16/favorite.png");
245- likes_hbox.pack_start (likes_icon, false, false, 2);
246+ try
247+ {
248+ var likes_icon = new Gtk.Image.from_file ("/usr/share/gwibber/ui/icons/streams/16x16/favorite.png");
249+ likes_hbox.pack_start (likes_icon, false, false, 2);
250+ }
251+ catch (Error e)
252+ {
253+ warning ("Failed to load likes icon: %s", e.message);
254+ }
255 likes_count = new Gtk.Label ("");
256 likes_hbox.pack_start (likes_count, false, false, 0);
257 vbox.pack_start (likes_hbox, false, false, 2);
258@@ -464,7 +477,13 @@
259 if (_comments != null)
260 {
261 var parser = new Json.Parser();
262- parser.load_from_data(_comments, -1);
263+ try
264+ {
265+ parser.load_from_data(_comments, -1);
266+ }
267+ catch (Error e)
268+ {
269+ }
270 unowned Json.Node comments_node = null;
271 comments_node = parser.get_root();
272 if (comments_node != null)
273@@ -667,7 +686,13 @@
274
275 if (_avatar_cache_image != null)
276 {
277- first_buf = new Gdk.Pixbuf.from_file(_avatar_cache_image);
278+ try
279+ {
280+ first_buf = new Gdk.Pixbuf.from_file(_avatar_cache_image);
281+ }
282+ catch (Error e)
283+ {
284+ }
285 } else
286 {
287 ulong _cache_avatar_id = Timeout.add (200, () => {
288@@ -679,7 +704,13 @@
289
290 if (_overlay_avatar_cache_image != null)
291 {
292- second_buf = new Gdk.Pixbuf.from_file(_overlay_avatar_cache_image);
293+ try
294+ {
295+ second_buf = new Gdk.Pixbuf.from_file(_overlay_avatar_cache_image);
296+ }
297+ catch (Error e)
298+ {
299+ }
300 } else
301 {
302 ulong _cache_overlay_avatar_id = Timeout.add (200, () => {
303@@ -906,12 +937,12 @@
304 if (uri.contains("imgur.com") && !uri.has_suffix(".png"))
305 {
306 /* let's point to the static content in imgur */
307- var last = uri.rstr("/").substring(1);
308+ var last = uri.substring(uri.last_index_of("/") + 1);
309 ret = "http://i.imgur.com/%s.png".printf(last);
310 }
311 else if (uri.contains("youtube.com"))
312 {
313- string id = uri.rstr("/").substring(1);
314+ string id = uri.substring(uri.last_index_of("/") + 1);
315
316 if (uri.contains("watch?v="))
317 {
318
319=== modified file 'libgwibber-gtk/user-view-tile.vala'
320--- libgwibber-gtk/user-view-tile.vala 2012-01-19 05:30:53 +0000
321+++ libgwibber-gtk/user-view-tile.vala 2012-02-11 06:20:27 +0000
322@@ -351,10 +351,22 @@
323 follow_but.set_active (_following);
324 follow_but.toggled.connect (() => {
325 var service = new Gwibber.Service ();
326- service.follow (_account, _sender_nick, follow_but.get_active ());
327+ try
328+ {
329+ service.follow (_account, _sender_nick, follow_but.get_active ());
330+ }
331+ catch (Error e)
332+ {
333+ }
334 // wait a moment so twitter records the follow/unfollow operation
335 Timeout.add_seconds(10, () => {
336- service.perform(_id);
337+ try
338+ {
339+ service.perform(_id);
340+ }
341+ catch (Error e)
342+ {
343+ }
344 return false;
345 });
346 });
347
348=== modified file 'libgwibber/searches.vala'
349--- libgwibber/searches.vala 2012-01-18 19:58:06 +0000
350+++ libgwibber/searches.vala 2012-02-11 06:20:27 +0000
351@@ -97,7 +97,7 @@
352 searches_map[member] = obj.get_string_member(member);
353 }
354 }
355- catch (GLib.IOError e)
356+ catch (GLib.Error e)
357 {
358 warning (e.message);
359 }
360@@ -171,7 +171,7 @@
361 searches_list.append(searches_map);
362 }
363 }
364- catch (GLib.IOError e)
365+ catch (GLib.Error e)
366 {
367 warning (e.message);
368 }
369
370=== modified file 'libgwibber/service.vala'
371--- libgwibber/service.vala 2011-10-25 16:20:32 +0000
372+++ libgwibber/service.vala 2012-02-11 06:20:27 +0000
373@@ -216,8 +216,7 @@
374 warning (e.message);
375 return false;
376 }
377- return false;
378- } catch (GLib.IOError e) {
379+ } catch (GLib.Error e) {
380 warning (e.message);
381 return false;
382 }
383@@ -257,8 +256,7 @@
384 warning (e.message);
385 return false;
386 }
387- return false;
388- } catch (GLib.IOError e) {
389+ } catch (GLib.Error e) {
390 warning (e.message);
391 return false;
392 }
393@@ -314,7 +312,7 @@
394
395 service.Send((string)json);
396 return true;
397- } catch (GLib.IOError e) {
398+ } catch (GLib.Error e) {
399 warning (e.message);
400 return false;
401 }
402@@ -328,7 +326,6 @@
403 return false;
404 }
405 }
406- return false;
407 }
408
409
410
411=== modified file 'libgwibber/streams.vala'
412--- libgwibber/streams.vala 2012-01-30 21:11:38 +0000
413+++ libgwibber/streams.vala 2012-02-11 06:20:27 +0000
414@@ -189,7 +189,14 @@
415 if (!transients)
416 {
417 debug ("Getting non-transient model");
418- Dee.SequenceModel? model = resources.load ("gwibber.stream_model") as Dee.SequenceModel;
419+ Dee.SequenceModel? model = null;
420+ try
421+ {
422+ model = resources.load ("gwibber.stream_model") as Dee.SequenceModel;
423+ }
424+ catch (Error e)
425+ {
426+ }
427 if (model is Dee.Model)
428 debug ("stream_model from resources has %u rows", model.get_n_rows ());
429 else
430@@ -216,7 +223,14 @@
431 else
432 {
433 debug ("Getting transient model");
434- Dee.SequenceModel? model = resources.load ("gwibber.transient_model") as Dee.SequenceModel;
435+ Dee.SequenceModel? model = null;
436+ try
437+ {
438+ model = resources.load ("gwibber.transient_model") as Dee.SequenceModel;
439+ }
440+ catch (Error e)
441+ {
442+ }
443 debug ("transient_model from resources has %u rows", model.get_n_rows ());
444 if (!(model is Dee.SequenceModel))
445 {
446@@ -241,7 +255,13 @@
447 {
448 //debug ("on_refresh %s - %s", change, data);
449 var parser = new Json.Parser();
450- parser.load_from_data(data, -1);
451+ try
452+ {
453+ parser.load_from_data(data, -1);
454+ }
455+ catch (Error e)
456+ {
457+ }
458 unowned Json.Node node = parser.get_root();
459 Json.Object obj = node.get_object();
460 if (obj != null)
461@@ -272,7 +292,13 @@
462 debug ("Fetched and parsed %u streams in %fms", streams.length(), timer.elapsed()*1000);
463
464 debug ("Storing gwibber.stream_model");
465- resources.store ((Dee.SequenceModel)stream_model, "gwibber.stream_model");
466+ try
467+ {
468+ resources.store ((Dee.SequenceModel)stream_model, "gwibber.stream_model");
469+ }
470+ catch (Error e)
471+ {
472+ }
473 return false;
474 });
475 }
476@@ -300,7 +326,13 @@
477 }
478 debug ("Fetched and parsed %u transient streams in %fms", streams_list.length(), timer.elapsed()*1000);
479 debug ("Storing gwibber.transient_model");
480- resources.store ((Dee.SequenceModel)transient_model, "gwibber.transient_model");
481+ try
482+ {
483+ resources.store ((Dee.SequenceModel)transient_model, "gwibber.transient_model");
484+ }
485+ catch (Error e)
486+ {
487+ }
488 debug ("transient_model has %u rows", transient_model.get_n_rows ());
489 return false;
490 });
491@@ -310,7 +342,13 @@
492 {
493 var timer = new Timer();
494 var parser = new Json.Parser();
495- parser.load_from_data(data, -1);
496+ try
497+ {
498+ parser.load_from_data(data, -1);
499+ }
500+ catch (Error e)
501+ {
502+ }
503 Json.Array nodeArray = parser.get_root().get_array();
504
505 for(int i = 0; i < nodeArray.get_length(); i++) {
506@@ -656,30 +694,24 @@
507 iter = seen.get(_textid);
508 if (iter == null)
509 return;
510- try
511+ string[] _accounts_array = (string[])_model.get_value (iter, StreamModelColumn.ACCOUNTS);
512+ if (!(_acct in _accounts_array))
513 {
514- string[] _accounts_array = (string[])_model.get_value (iter, StreamModelColumn.ACCOUNTS);
515- if (!(_acct in _accounts_array))
516- {
517- foreach (var a in _accounts_array)
518- builder.add ("s", a);
519- var _accounts = new Variant ("as", builder);
520- _model.set_value (iter, StreamModelColumn.ACCOUNTS, _accounts);
521- }
522- _model.set_value (iter, StreamModelColumn.MESSAGE, _text);
523- _model.set_value (iter, StreamModelColumn.HTML, _html);
524- _model.set_value (iter, StreamModelColumn.TIMESTRING, _t);
525- _model.set_value (iter, StreamModelColumn.LIKES, _likes);
526- iter = null;
527- } catch {
528- debug ("Failed to update record for mid: %s", _mid);
529+ foreach (var a in _accounts_array)
530+ builder.add ("s", a);
531+ var _accounts = new Variant ("as", builder);
532+ _model.set_value (iter, StreamModelColumn.ACCOUNTS, _accounts);
533 }
534+ _model.set_value (iter, StreamModelColumn.MESSAGE, _text);
535+ _model.set_value (iter, StreamModelColumn.HTML, _html);
536+ _model.set_value (iter, StreamModelColumn.TIMESTRING, _t);
537+ _model.set_value (iter, StreamModelColumn.LIKES, _likes);
538+ iter = null;
539 return;
540 }
541
542 var _accounts = new Variant ("as", builder);
543
544- try {
545 iter = _model.append(
546 _accounts,
547 _stream,
548@@ -720,9 +752,6 @@
549 _recipient_nick,
550 _recipient_icon
551 );
552- } catch {
553- iter = null;
554- }
555
556 if (_textid.length > 1 && iter != null)
557 seen[_textid] = iter;
558@@ -741,7 +770,13 @@
559 {
560 var result = streams_service.Get(id);
561 var parser = new Json.Parser();
562- parser.load_from_data(result, -1);
563+ try
564+ {
565+ parser.load_from_data(result, -1);
566+ }
567+ catch (Error e)
568+ {
569+ }
570 Json.Object obj = parser.get_root().get_object();
571 var members = obj.get_members();
572 foreach (string member in members)
573@@ -835,7 +870,7 @@
574 streams_list.append(stream_map);
575 }
576 }
577- catch (GLib.IOError e)
578+ catch (GLib.Error e)
579 {
580 warning (e.message);
581 }
582@@ -903,7 +938,13 @@
583
584 var result = streams_service.Messages("profile", "all", 0, id, "0", "time", "DESC", 1);
585 var parser = new Json.Parser();
586- parser.load_from_data(result, -1);
587+ try
588+ {
589+ parser.load_from_data(result, -1);
590+ }
591+ catch (Error e)
592+ {
593+ }
594 Json.Array nodeArray = parser.get_root().get_array();
595
596 Json.Object obj = nodeArray.get_element(0).get_object ();
597
598=== modified file 'libgwibber/utils.vala'
599--- libgwibber/utils.vala 2011-12-08 02:11:00 +0000
600+++ libgwibber/utils.vala 2012-02-11 06:20:27 +0000
601@@ -113,13 +113,9 @@
602
603 internal void setup (string name) throws GLib.IOError
604 {
605- try {
606- interface_name = name;
607- /* we should use name the name argument to make this more dynamic */
608- do_setup.begin(name);
609- } catch (GLib.IOError e) {
610- warning (e.message);
611- }
612+ interface_name = name;
613+ /* we should use name the name argument to make this more dynamic */
614+ do_setup.begin(name);
615 }
616 }
617 }