|
1 Fix compilation of recent glib removing G_CONST_RETURN |
|
2 |
|
3 https://bugzilla.gnome.org/show_bug.cgi?id=658884 |
|
4 |
|
5 diff -ur gamin-0.1.10/server.orig/gam_node.c gamin-0.1.10/server/gam_node.c |
|
6 --- gamin-0.1.10/server.orig/gam_node.c Mon Aug 26 15:25:23 2013 |
|
7 +++ gamin-0.1.10/server/gam_node.c Mon Aug 26 15:25:54 2013 |
|
8 @@ -122,7 +122,7 @@ |
|
9 * it has finished with the string. If it must keep it longer, it |
|
10 * should makes its own copy. The returned string must not be freed. |
|
11 */ |
|
12 -G_CONST_RETURN char * |
|
13 +const char * |
|
14 gam_node_get_path(GamNode * node) |
|
15 { |
|
16 g_assert(node); |
|
17 diff -ur gamin-0.1.10/server.orig/gam_node.h gamin-0.1.10/server/gam_node.h |
|
18 --- gamin-0.1.10/server.orig/gam_node.h Mon Aug 26 15:25:22 2013 |
|
19 +++ gamin-0.1.10/server/gam_node.h Mon Aug 26 15:25:54 2013 |
|
20 @@ -58,7 +58,7 @@ |
|
21 void gam_node_set_is_dir (GamNode *node, |
|
22 gboolean is_dir); |
|
23 |
|
24 -G_CONST_RETURN char *gam_node_get_path (GamNode *node); |
|
25 +const char *gam_node_get_path (GamNode *node); |
|
26 |
|
27 GList *gam_node_get_subscriptions (GamNode *node); |
|
28 |
|
29 diff -ur gamin-0.1.10/server.orig/gam_subscription.c gamin-0.1.10/server/gam_subscription.c |
|
30 --- gamin-0.1.10/server.orig/gam_subscription.c Mon Aug 26 15:25:22 2013 |
|
31 +++ gamin-0.1.10/server/gam_subscription.c Mon Aug 26 15:25:54 2013 |
|
32 @@ -141,7 +141,7 @@ |
|
33 * @param sub the GamSubscription |
|
34 * @returns The path being monitored. It should not be freed. |
|
35 */ |
|
36 -G_CONST_RETURN char * |
|
37 +const char * |
|
38 gam_subscription_get_path(GamSubscription * sub) |
|
39 { |
|
40 if (sub == NULL) |
|
41 diff -ur gamin-0.1.10/server.orig/gam_subscription.h gamin-0.1.10/server/gam_subscription.h |
|
42 --- gamin-0.1.10/server.orig/gam_subscription.h Mon Aug 26 15:25:22 2013 |
|
43 +++ gamin-0.1.10/server/gam_subscription.h Mon Aug 26 15:25:54 2013 |
|
44 @@ -21,7 +21,7 @@ |
|
45 |
|
46 int gam_subscription_get_reqno (GamSubscription *sub); |
|
47 |
|
48 -G_CONST_RETURN char *gam_subscription_get_path (GamSubscription *sub); |
|
49 +const char *gam_subscription_get_path (GamSubscription *sub); |
|
50 |
|
51 GamListener *gam_subscription_get_listener (GamSubscription *sub); |
|
52 |