Noise

Merge lp:~nonamenoname/noise/fix-1270091 into lp:~elementary-apps/noise/trunk

  1. fix-1270091
  2. Merge into trunk
Proposed by No Name
Status: Merged
Approved by: Cody Garver
Approved revision: 1554
Merged at revision: 1555
Proposed branch: lp:~nonamenoname/noise/fix-1270091
Merge into: lp:~elementary-apps/noise/trunk
Diff against target: 57 lines (+5/-5)
4 files modified
CMakeLists.txt (+2/-2)
core/noise-core.deps (+1/-1)
core/noise-core.pc.cmake (+1/-1)
src/Dialogs/TransferFromDeviceDialog.vala (+1/-1)
To merge this branch: bzr merge lp:~nonamenoname/noise/fix-1270091
Reviewer Review Type Date Requested Status
elementary Apps team Pending
Review via email: mp+203144@code.launchpad.net

Commit message

Switch to gee-0.8

Description of the change

Switch to gee-0.8

To post a comment you must log in.
Revision history for this message
Victor Martinez (victored) wrote :

Looks good!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2013-12-01 14:35:04 +0000
3+++ CMakeLists.txt 2014-01-24 18:17:47 +0000
4@@ -56,7 +56,7 @@
5 set (CORE_PACKAGES
6 glib-2.0
7 gio-2.0
8- gee-1.0
9+ gee-0.8
10 libpeas-1.0
11 libpeas-gtk-1.0
12 gtk+-3.0
13@@ -69,7 +69,7 @@
14 set (CORE_PKG
15 glib-2.0>=2.32
16 gio-2.0
17- gee-1.0
18+ gee-0.8
19 libpeas-1.0
20 libpeas-gtk-1.0
21 gtk+-3.0>=3.4.2
22
23=== modified file 'core/noise-core.deps'
24--- core/noise-core.deps 2013-06-02 20:07:16 +0000
25+++ core/noise-core.deps 2014-01-24 18:17:47 +0000
26@@ -1,6 +1,6 @@
27 glib-2.0
28 gio-2.0
29-gee-1.0
30+gee-0.8
31 libpeas-1.0
32 libpeas-gtk-1.0
33 gtk+-3.0
34
35=== modified file 'core/noise-core.pc.cmake'
36--- core/noise-core.pc.cmake 2013-06-12 18:04:28 +0000
37+++ core/noise-core.pc.cmake 2014-01-24 18:17:47 +0000
38@@ -8,5 +8,5 @@
39 Version: 0.2
40 Libs: -lnoise-core
41 Cflags: -I@DOLLAR@{includedir}/noise-core
42-Requires: glib-2.0 gio-2.0 gee-1.0 libpeas-1.0 libpeas-gtk-1.0 gtk+-3.0 granite gstreamer-0.10 gstreamer-interfaces-0.10 gstreamer-tag-0.10 gstreamer-pbutils-0.10
43+Requires: glib-2.0 gio-2.0 gee-0.8 libpeas-1.0 libpeas-gtk-1.0 gtk+-3.0 granite gstreamer-0.10 gstreamer-interfaces-0.10 gstreamer-tag-0.10 gstreamer-pbutils-0.10
44
45
46=== modified file 'src/Dialogs/TransferFromDeviceDialog.vala'
47--- src/Dialogs/TransferFromDeviceDialog.vala 2013-02-28 23:45:33 +0000
48+++ src/Dialogs/TransferFromDeviceDialog.vala 2014-01-24 18:17:47 +0000
49@@ -145,7 +145,7 @@
50 var medias_sorted = new LinkedList<Media>();
51 foreach(var m in medias)
52 medias_sorted.add(m);
53- medias_sorted.sort((CompareFunc)mediaCompareFunc);
54+ medias_sorted.sort(mediaCompareFunc);
55
56 foreach(var s in medias_sorted) {
57 TreeIter item;

Subscribers

People subscribed via source and target branches