libubuntuone

Merge lp:~rodrigo-moya/libubuntuone/fix-mono-bindings into lp:libubuntuone

  1. fix-mono-bindings
  2. Merge into trunk
Proposed by Rodrigo Moya on 2010-08-26
Status: Merged
Approved by: Rodrigo Moya on 2010-08-27
Approved revision: 99
Merged at revision: 98
Proposed branch: lp:~rodrigo-moya/libubuntuone/fix-mono-bindings
Merge into: lp:libubuntuone
Diff against target: 59 lines (+11/-7)
2 files modified
bindings/mono/ubuntuone.sources.in (+3/-2)
libubuntuone/u1-music-store.h (+8/-5)
To merge this branch: bzr merge lp:~rodrigo-moya/libubuntuone/fix-mono-bindings
Reviewer Review Type Date Requested Status
Natalia Bidart Approve on 2010-08-27
John Lenton 2010-08-26 Approve on 2010-08-26
Review via email: mp+33851@code.launchpad.net

Commit Message

Fix generation of Mono bindings

Description of the Change

Fix generation of Mono bindings

To post a comment you must log in.
John Lenton (chipaca) :
review: Approve
Natalia Bidart (nataliabidart) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bindings/mono/ubuntuone.sources.in'
2--- bindings/mono/ubuntuone.sources.in 2010-06-01 13:44:11 +0000
3+++ bindings/mono/ubuntuone.sources.in 2010-08-26 23:23:38 +0000
4@@ -1,8 +1,9 @@
5 <gapi-parser-input>
6 <api filename="ubuntuone-api.xml">
7- <library name="ubuntuone-sharp.dll">
8+ <library name="libubuntuone-1.0.dll">
9 <namespace name="UbuntuOne">
10- <dir>@TOP_SRCDIR@/libubuntuone/</dir>
11+ <file>@TOP_SRCDIR@/libubuntuone/u1-music-store.h</file>
12+ <file>@TOP_SRCDIR@/libubuntuone/u1-music-store.c</file>
13 </namespace>
14 </library>
15 </api>
16
17=== modified file 'libubuntuone/u1-music-store.h'
18--- libubuntuone/u1-music-store.h 2010-05-27 11:51:36 +0000
19+++ libubuntuone/u1-music-store.h 2010-08-26 23:23:38 +0000
20@@ -24,6 +24,7 @@
21
22 #include <gtk/gtk.h>
23
24+
25 G_BEGIN_DECLS
26
27 #define U1_TYPE_MUSIC_STORE (u1_music_store_get_type ())
28@@ -33,14 +34,16 @@
29 #define U1_IS_MUSIC_STORE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), U1_TYPE_MUSIC_STORE))
30 #define U1_MUSIC_STORE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), U1_TYPE_MUSIC_STORE, U1MusicStoreClass))
31
32+typedef struct _U1MusicStore U1MusicStore;
33+typedef struct _U1MusicStoreClass U1MusicStoreClass;
34 typedef struct _U1MusicStorePrivate U1MusicStorePrivate;
35
36-typedef struct {
37+struct _U1MusicStore {
38 GtkVBox parent;
39 U1MusicStorePrivate *priv;
40-} U1MusicStore;
41+};
42
43-typedef struct {
44+struct _U1MusicStoreClass {
45 GtkVBoxClass parent_class;
46
47 /* Signals */
48@@ -48,9 +51,9 @@
49 void (* play_library) (U1MusicStore *music_store, const gchar *path);
50 void (* url_loaded) (U1MusicStore *music_store, const gchar *url);
51 void (* download_finished) (U1MusicStore *music_store, const gchar *path);
52-} U1MusicStoreClass;
53+};
54
55-GType u1_music_store_get_type (void);
56+GType u1_music_store_get_type (void);
57
58 GtkWidget *u1_music_store_new (void);
59 const gchar *u1_music_store_get_library_location (U1MusicStore *music_store);

Subscribers

People subscribed via source and target branches