Gwibber

Merge lp:~ken-vandine/gwibber/valac-0.16 into lp:gwibber

  1. valac-0.16
  2. Merge into trunk
Proposed by Ken VanDine
Status: Merged
Merged at revision: 1241
Proposed branch: lp:~ken-vandine/gwibber/valac-0.16
Merge into: lp:gwibber
Diff against target: 61 lines (+10/-4)
4 files modified
NEWS (+6/-0)
acinclude.m4 (+1/-1)
configure.ac (+1/-1)
libgwibber-gtk/entry.vala (+2/-2)
To merge this branch: bzr merge lp:~ken-vandine/gwibber/valac-0.16
Reviewer Review Type Date Requested Status
Michael Terry (community) Approve
Review via email: mp+89071@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Michael Terry (mterry) wrote :

Looks fine!

You might consider changing the AC_PATH_PROG line to something like this:

[AC_PATH_PROGS([VALAC], [valac-0.16 valac], [])

That way, when valac-0.18 comes out, as long as it is source-compatible (hah!), developers don't need to change anything, because configure will find the default 'valac' provided by valac-0.18.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'NEWS'
2--- NEWS 2012-01-13 10:48:15 +0000
3+++ NEWS 2012-01-18 16:28:28 +0000
4@@ -1,3 +1,9 @@
5+NEW in 3.3.3 (UNRELEASED)
6+============
7+
8+Now requires valac-0.16
9+
10+
11 NEW in 3.3.2 (01/13/2012)
12 ============
13
14
15=== modified file 'acinclude.m4'
16--- acinclude.m4 2011-10-25 16:20:32 +0000
17+++ acinclude.m4 2012-01-18 16:28:28 +0000
18@@ -254,7 +254,7 @@
19 # GWIBBER_PROG_VALAC([MINIMUM-VERSION])
20 # --------------------------------
21 AC_DEFUN([GWIBBER_PROG_VALAC],
22-[AC_PATH_PROG([VALAC], [valac-0.14], [])
23+[AC_PATH_PROG([VALAC], [valac-0.16], [])
24 AS_IF([test -z "$VALAC"],
25 [AC_MSG_WARN([No Vala compiler found. You will not be able to compile .vala source files.])],
26 [AS_IF([test -n "$1"],
27
28=== modified file 'configure.ac'
29--- configure.ac 2012-01-13 10:40:33 +0000
30+++ configure.ac 2012-01-18 16:28:28 +0000
31@@ -30,7 +30,7 @@
32
33 dnl Init the other things we depend on
34 AM_MAINTAINER_MODE
35-GWIBBER_PROG_VALAC([0.14.0])
36+GWIBBER_PROG_VALAC([0.15.0])
37
38 AS_IF([test -z "$VALAC"], [AC_MSG_ERROR(["No valac compiler found."])])
39 AC_PROG_CC
40
41=== modified file 'libgwibber-gtk/entry.vala'
42--- libgwibber-gtk/entry.vala 2011-08-18 15:44:58 +0000
43+++ libgwibber-gtk/entry.vala 2012-01-18 16:28:28 +0000
44@@ -206,7 +206,7 @@
45 chars > MAX_MESSAGE_LENGTH ? error_color : fg_color);
46 }
47
48- private void on_text_inserted (Gtk.TextIter iter, string text, int len)
49+ private void on_text_inserted (ref Gtk.TextIter iter, string text, int len)
50 {
51 if (last_was_shortened == false
52 && len > 30
53@@ -217,7 +217,7 @@
54 Signal.stop_emission_by_name (buf, "insert-text") ;
55 var shrt = urlshorten.shorten (text);
56 last_was_shortened = true;
57- buf.insert (iter, shrt, -1);
58+ buf.insert (ref iter, shrt, -1);
59 }
60 else
61 {