1 |
Description: Don't use deprecated G_CONST_RETURN. Fixes building with newer glib versions. |
diff -Naur gamin-0.1.10/server/gam_node.c gamin-0.1.10-fixed/server/gam_node.c |
2 |
Author: Matthias Klose <doko@ubuntu.com> |
--- gamin-0.1.10/server/gam_node.c 2007-07-04 15:36:49.000000000 +0200 |
3 |
Bug-Ubuntu: https://launchpad.net/bugs/829504 |
+++ gamin-0.1.10-fixed/server/gam_node.c 2012-10-15 22:30:44.368983206 +0200 |
|
|
|
|
Index: gamin/server/gam_node.c |
|
|
=================================================================== |
|
|
--- gamin.orig/server/gam_node.c 2011-10-18 16:09:04.873780685 +0200 |
|
|
+++ gamin/server/gam_node.c 2011-10-18 16:09:01.965780543 +0200 |
|
4 |
@@ -122,7 +122,7 @@ |
@@ -122,7 +122,7 @@ |
5 |
* it has finished with the string. If it must keep it longer, it |
* it has finished with the string. If it must keep it longer, it |
6 |
* should makes its own copy. The returned string must not be freed. |
* should makes its own copy. The returned string must not be freed. |
10 |
gam_node_get_path(GamNode * node) |
gam_node_get_path(GamNode * node) |
11 |
{ |
{ |
12 |
g_assert(node); |
g_assert(node); |
13 |
Index: gamin/server/gam_node.h |
diff -Naur gamin-0.1.10/server/gam_node.h gamin-0.1.10-fixed/server/gam_node.h |
14 |
=================================================================== |
--- gamin-0.1.10/server/gam_node.h 2007-07-04 15:36:49.000000000 +0200 |
15 |
--- gamin.orig/server/gam_node.h 2011-10-18 16:09:04.729780677 +0200 |
+++ gamin-0.1.10-fixed/server/gam_node.h 2012-10-15 22:31:27.629983204 +0200 |
|
+++ gamin/server/gam_node.h 2011-10-18 16:09:01.961780544 +0200 |
|
16 |
@@ -58,7 +58,7 @@ |
@@ -58,7 +58,7 @@ |
17 |
void gam_node_set_is_dir (GamNode *node, |
void gam_node_set_is_dir (GamNode *node, |
18 |
gboolean is_dir); |
gboolean is_dir); |
19 |
|
|
20 |
-G_CONST_RETURN char *gam_node_get_path (GamNode *node); |
-G_CONST_RETURN char *gam_node_get_path (GamNode *node); |
21 |
+const char *gam_node_get_path (GamNode *node); |
+const char *gam_node_get_path (GamNode *node); |
22 |
|
|
23 |
GList *gam_node_get_subscriptions (GamNode *node); |
GList *gam_node_get_subscriptions (GamNode *node); |
24 |
|
|
25 |
Index: gamin/server/gam_subscription.c |
diff -Naur gamin-0.1.10/server/gam_subscription.c gamin-0.1.10-fixed/server/gam_subscription.c |
26 |
=================================================================== |
--- gamin-0.1.10/server/gam_subscription.c 2007-07-04 15:36:49.000000000 +0200 |
27 |
--- gamin.orig/server/gam_subscription.c 2011-10-18 16:09:04.817780682 +0200 |
+++ gamin-0.1.10-fixed/server/gam_subscription.c 2012-10-15 22:31:09.911983206 +0200 |
|
+++ gamin/server/gam_subscription.c 2011-10-18 16:09:01.965780543 +0200 |
|
28 |
@@ -141,7 +141,7 @@ |
@@ -141,7 +141,7 @@ |
29 |
* @param sub the GamSubscription |
* @param sub the GamSubscription |
30 |
* @returns The path being monitored. It should not be freed. |
* @returns The path being monitored. It should not be freed. |
34 |
gam_subscription_get_path(GamSubscription * sub) |
gam_subscription_get_path(GamSubscription * sub) |
35 |
{ |
{ |
36 |
if (sub == NULL) |
if (sub == NULL) |
37 |
Index: gamin/server/gam_subscription.h |
diff -Naur gamin-0.1.10/server/gam_subscription.h gamin-0.1.10-fixed/server/gam_subscription.h |
38 |
=================================================================== |
--- gamin-0.1.10/server/gam_subscription.h 2007-07-04 15:36:49.000000000 +0200 |
39 |
--- gamin.orig/server/gam_subscription.h 2011-10-18 16:09:04.929780687 +0200 |
+++ gamin-0.1.10-fixed/server/gam_subscription.h 2012-10-15 22:32:01.425983206 +0200 |
|
+++ gamin/server/gam_subscription.h 2011-10-18 16:09:01.965780543 +0200 |
|
40 |
@@ -21,7 +21,7 @@ |
@@ -21,7 +21,7 @@ |
41 |
|
|
42 |
int gam_subscription_get_reqno (GamSubscription *sub); |
int gam_subscription_get_reqno (GamSubscription *sub); |
43 |
|
|
44 |
-G_CONST_RETURN char *gam_subscription_get_path (GamSubscription *sub); |
-G_CONST_RETURN char *gam_subscription_get_path (GamSubscription *sub); |
45 |
+const char *gam_subscription_get_path (GamSubscription *sub); |
+const char *gam_subscription_get_path (GamSubscription *sub); |
46 |
|
|
47 |
GamListener *gam_subscription_get_listener (GamSubscription *sub); |
GamListener *gam_subscription_get_listener (GamSubscription *sub); |
48 |
|
|