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
1
<gapi-parser-input>
1
<gapi-parser-input>
6
2
  <api filename="ubuntuone-api.xml">
2
  <api filename="ubuntuone-api.xml">
8
3
    <library name="ubuntuone-sharp.dll">
3
    <library name="libubuntuone-1.0.dll">
9
4
      <namespace name="UbuntuOne">
4
      <namespace name="UbuntuOne">
11
5
        <dir>@TOP_SRCDIR@/libubuntuone/</dir>
5
        <file>@TOP_SRCDIR@/libubuntuone/u1-music-store.h</file>
12
6
	<file>@TOP_SRCDIR@/libubuntuone/u1-music-store.c</file>
13
6
      </namespace>
7
      </namespace>
14
7
    </library>
8
    </library>
15
8
  </api>
9
  </api>
16
9
10
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
24
24
22
25
#include <gtk/gtk.h>
25
#include <gtk/gtk.h>
23
26
26
24
27
25
27
G_BEGIN_DECLS
28
G_BEGIN_DECLS
26
28
29
27
29
#define U1_TYPE_MUSIC_STORE                (u1_music_store_get_type ())
30
#define U1_TYPE_MUSIC_STORE                (u1_music_store_get_type ())
28
@@ -33,14 +34,16 @@
29
33
#define U1_IS_MUSIC_STORE_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE ((klass), U1_TYPE_MUSIC_STORE))
34
#define U1_IS_MUSIC_STORE_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE ((klass), U1_TYPE_MUSIC_STORE))
30
34
#define U1_MUSIC_STORE_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), U1_TYPE_MUSIC_STORE, U1MusicStoreClass))
35
#define U1_MUSIC_STORE_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), U1_TYPE_MUSIC_STORE, U1MusicStoreClass))
31
35
36
32
37
typedef struct _U1MusicStore        U1MusicStore;
33
38
typedef struct _U1MusicStoreClass   U1MusicStoreClass;
34
36
typedef struct _U1MusicStorePrivate U1MusicStorePrivate;
39
typedef struct _U1MusicStorePrivate U1MusicStorePrivate;
35
37
40
37
38
typedef struct {
41
struct _U1MusicStore {
38
39
	GtkVBox parent;
42
	GtkVBox parent;
39
40
	U1MusicStorePrivate *priv;
43
	U1MusicStorePrivate *priv;
41
41
} U1MusicStore;
44
};
42
42
45
44
43
typedef struct {
46
struct _U1MusicStoreClass {
45
44
	GtkVBoxClass parent_class;
47
	GtkVBoxClass parent_class;
46
45
48
47
46
	/* Signals */
49
	/* Signals */
48
@@ -48,9 +51,9 @@
49
48
	void (* play_library) (U1MusicStore *music_store, const gchar *path);
51
	void (* play_library) (U1MusicStore *music_store, const gchar *path);
50
49
	void (* url_loaded) (U1MusicStore *music_store, const gchar *url);
52
	void (* url_loaded) (U1MusicStore *music_store, const gchar *url);
51
50
	void (* download_finished) (U1MusicStore *music_store, const gchar *path);
53
	void (* download_finished) (U1MusicStore *music_store, const gchar *path);
53
51
} U1MusicStoreClass;
54
};
54
52
55
56
53
GType      u1_music_store_get_type (void);
56
GType        u1_music_store_get_type (void);
57
54
57
58
55
GtkWidget   *u1_music_store_new (void);
58
GtkWidget   *u1_music_store_new (void);
59
56
const gchar *u1_music_store_get_library_location (U1MusicStore *music_store);
59
const gchar *u1_music_store_get_library_location (U1MusicStore *music_store);
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
Related bugs:	Link a bug report
Reviewer	Date Requested	Status
Natalia Bidart (community)		Approve on 2010-08-27
John Lenton (community)	2010-08-26	Approve on 2010-08-26
Review via email: mp+33851@code.launchpad.net