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