Diodon

Merge lp:~hleinone/diodon/playground into lp:~diodon-team/diodon/playground

  1. playground
  2. Merge into playground
Proposed by Hannu Leinonen
Status: Merged
Merged at revision: 11
Proposed branch: lp:~hleinone/diodon/playground
Merge into: lp:~diodon-team/diodon/playground
Diff against target: 43 lines (+6/-4)
3 files modified
src/clipboard.vala (+1/-1)
src/wscript (+3/-3)
wscript (+2/-0)
To merge this branch: bzr merge lp:~hleinone/diodon/playground
Reviewer Review Type Date Requested Status
Oliver Sauder Approve
Review via email: mp+61008@code.launchpad.net

Description of the change

Fixed the waf scripts.

To post a comment you must log in.
Revision history for this message
Oliver Sauder (sao) wrote :

Have not used the playground for quite a while so did not really reckon that it cannot be built. Thanks for your patch.

Merged.

review: Approve
Revision history for this message
Hannu Leinonen (hleinone) wrote :

I was just trying to learn some Vala programming for an indicator app and this seemed like a good example to start with. Getting it to compile was a bit challenging and once I got it done I thought I could share it.

Revision history for this message
Oliver Sauder (sao) wrote :

That's exactly what the playground is here for.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/clipboard.vala'
2--- src/clipboard.vala 2010-07-24 01:48:54 +0000
3+++ src/clipboard.vala 2011-05-14 23:58:22 +0000
4@@ -60,7 +60,7 @@
5 clearItem.activate.connect(on_clicked_clear);
6 appMenu.append(clearItem);
7
8- var quitItem = new Gtk.ImageMenuItem.from_stock(Gtk.STOCK_QUIT, null);
9+ var quitItem = new Gtk.ImageMenuItem.from_stock(Gtk.Stock.QUIT, null);
10 quitItem.activate.connect(Gtk.main_quit);
11 appMenu.append(quitItem);
12
13
14=== modified file 'src/wscript'
15--- src/wscript 2010-07-19 20:22:31 +0000
16+++ src/wscript 2011-05-14 23:58:22 +0000
17@@ -10,11 +10,11 @@
18 prog.target = 'clipboard'
19 prog.source = 'clipboard.vala'
20 # libraries to link against
21- prog.uselib = 'GTK GEE APPINDICATOR'
22+ prog.uselib = 'GTK GEE APPINDICATOR SQLITE'
23 # Vala packages to use
24- prog.packages = 'gtk+-2.0 gee-1.0 appindicator-0.1'
25+ prog.packages = 'gtk+-2.0 gee-1.0 appindicator-0.1 sqlite3'
26 # Extra vapi dirs
27- #prog.vapi_dirs = '../my_lib'
28+ prog.vapi_dirs = '.'
29 # Enable threading
30 #prog.threading = True
31
32
33=== modified file 'wscript'
34--- wscript 2010-07-16 22:53:11 +0000
35+++ wscript 2011-05-14 23:58:22 +0000
36@@ -24,6 +24,8 @@
37 atleast_version='2.10.0', mandatory=1, args='--cflags --libs')
38 conf.check_cfg(package='gee-1.0', uselib_store='GEE',
39 atleast_version='0.5.0', mandatory=1, args='--cflags --libs')
40+ conf.check_cfg(package='sqlite3', uselib_store='SQLITE',
41+ atleast_version='3.7.0', mandatory=1, args='--cflags --libs')
42 conf.check_cfg(package='appindicator-0.1', uselib_store='APPINDICATOR',
43 atleast_version='0.2.3', mandatory=1, args='--cflags --libs')
44

Subscribers

People subscribed via source and target branches