67 lines
2.5 KiB
Diff
67 lines
2.5 KiB
Diff
|
From: Jan Engelhardt <jengelh@medozas.de>
|
||
|
|
Date: 2011-09-22 13:34:35.152493695 +0200
|
||
|
|
|
||
|
|
Well guess what, there is a -DG_DISABLE_DEPRECATED in Makefile.am,
|
||
|
|
but the source code uses the deprecated G_CONST_RETURN.
|
||
|
|
Substitute it...
|
||
|
|
|
||
|
|
---
|
||
|
|
server/gam_node.c | 2 +-
|
||
|
|
server/gam_node.h | 2 +-
|
||
|
|
server/gam_subscription.c | 2 +-
|
||
|
|
server/gam_subscription.h | 2 +-
|
||
|
|
4 files changed, 4 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
Index: gamin-0.1.10/server/gam_node.c
|
||
|
|
===================================================================
|
||
|
|
--- gamin-0.1.10.orig/server/gam_node.c
|
||
|
|
+++ gamin-0.1.10/server/gam_node.c
|
||
|
|
@@ -122,7 +122,7 @@ gam_node_set_is_dir(GamNode * node, gboo
|
||
|
|
* it has finished with the string. If it must keep it longer, it
|
||
|
|
* should makes its own copy. The returned string must not be freed.
|
||
|
|
*/
|
||
|
|
-G_CONST_RETURN char *
|
||
|
|
+const char *
|
||
|
|
gam_node_get_path(GamNode * node)
|
||
|
|
{
|
||
|
|
g_assert(node);
|
||
|
|
Index: gamin-0.1.10/server/gam_node.h
|
||
|
|
===================================================================
|
||
|
|
--- gamin-0.1.10.orig/server/gam_node.h
|
||
|
|
+++ gamin-0.1.10/server/gam_node.h
|
||
|
|
@@ -58,7 +58,7 @@ gboolean gam_node_is_dir
|
||
|
|
void gam_node_set_is_dir (GamNode *node,
|
||
|
|
gboolean is_dir);
|
||
|
|
|
||
|
|
-G_CONST_RETURN char *gam_node_get_path (GamNode *node);
|
||
|
|
+const char *gam_node_get_path (GamNode *node);
|
||
|
|
|
||
|
|
GList *gam_node_get_subscriptions (GamNode *node);
|
||
|
|
|
||
|
|
Index: gamin-0.1.10/server/gam_subscription.c
|
||
|
|
===================================================================
|
||
|
|
--- gamin-0.1.10.orig/server/gam_subscription.c
|
||
|
|
+++ gamin-0.1.10/server/gam_subscription.c
|
||
|
|
@@ -141,7 +141,7 @@ gam_subscription_pathlen(GamSubscription
|
||
|
|
* @param sub the GamSubscription
|
||
|
|
* @returns The path being monitored. It should not be freed.
|
||
|
|
*/
|
||
|
|
-G_CONST_RETURN char *
|
||
|
|
+const char *
|
||
|
|
gam_subscription_get_path(GamSubscription * sub)
|
||
|
|
{
|
||
|
|
if (sub == NULL)
|
||
|
|
Index: gamin-0.1.10/server/gam_subscription.h
|
||
|
|
===================================================================
|
||
|
|
--- gamin-0.1.10.orig/server/gam_subscription.h
|
||
|
|
+++ gamin-0.1.10/server/gam_subscription.h
|
||
|
|
@@ -21,7 +21,7 @@ int gam_subscription_pa
|
||
|
|
|
||
|
|
int gam_subscription_get_reqno (GamSubscription *sub);
|
||
|
|
|
||
|
|
-G_CONST_RETURN char *gam_subscription_get_path (GamSubscription *sub);
|
||
|
|
+const char *gam_subscription_get_path (GamSubscription *sub);
|
||
|
|
|
||
|
|
GamListener *gam_subscription_get_listener (GamSubscription *sub);
|
||
|
|
|