Annotation of /trunk/gamin/patches/gamin-0.1.10-fix-deprecated-const.patch
Parent Directory | Revision Log
Revision 1914 -
(hide annotations)
(download)
Mon Oct 15 18:20:10 2012 UTC (11 years, 11 months ago) by niro
File size: 2320 byte(s)
Mon Oct 15 18:20:10 2012 UTC (11 years, 11 months ago) by niro
File size: 2320 byte(s)
added build fix for newer glib2
1 | niro | 1914 | Description: Don't use deprecated G_CONST_RETURN. Fixes building with newer glib versions. |
2 | Author: Matthias Klose <doko@ubuntu.com> | ||
3 | Bug-Ubuntu: https://launchpad.net/bugs/829504 | ||
4 | |||
5 | Index: gamin/server/gam_node.c | ||
6 | =================================================================== | ||
7 | --- gamin.orig/server/gam_node.c 2011-10-18 16:09:04.873780685 +0200 | ||
8 | +++ gamin/server/gam_node.c 2011-10-18 16:09:01.965780543 +0200 | ||
9 | @@ -122,7 +122,7 @@ | ||
10 | * it has finished with the string. If it must keep it longer, it | ||
11 | * should makes its own copy. The returned string must not be freed. | ||
12 | */ | ||
13 | -G_CONST_RETURN char * | ||
14 | +const char * | ||
15 | gam_node_get_path(GamNode * node) | ||
16 | { | ||
17 | g_assert(node); | ||
18 | Index: gamin/server/gam_node.h | ||
19 | =================================================================== | ||
20 | --- gamin.orig/server/gam_node.h 2011-10-18 16:09:04.729780677 +0200 | ||
21 | +++ gamin/server/gam_node.h 2011-10-18 16:09:01.961780544 +0200 | ||
22 | @@ -58,7 +58,7 @@ | ||
23 | void gam_node_set_is_dir (GamNode *node, | ||
24 | gboolean is_dir); | ||
25 | |||
26 | -G_CONST_RETURN char *gam_node_get_path (GamNode *node); | ||
27 | +const char *gam_node_get_path (GamNode *node); | ||
28 | |||
29 | GList *gam_node_get_subscriptions (GamNode *node); | ||
30 | |||
31 | Index: gamin/server/gam_subscription.c | ||
32 | =================================================================== | ||
33 | --- gamin.orig/server/gam_subscription.c 2011-10-18 16:09:04.817780682 +0200 | ||
34 | +++ gamin/server/gam_subscription.c 2011-10-18 16:09:01.965780543 +0200 | ||
35 | @@ -141,7 +141,7 @@ | ||
36 | * @param sub the GamSubscription | ||
37 | * @returns The path being monitored. It should not be freed. | ||
38 | */ | ||
39 | -G_CONST_RETURN char * | ||
40 | +const char * | ||
41 | gam_subscription_get_path(GamSubscription * sub) | ||
42 | { | ||
43 | if (sub == NULL) | ||
44 | Index: gamin/server/gam_subscription.h | ||
45 | =================================================================== | ||
46 | --- gamin.orig/server/gam_subscription.h 2011-10-18 16:09:04.929780687 +0200 | ||
47 | +++ gamin/server/gam_subscription.h 2011-10-18 16:09:01.965780543 +0200 | ||
48 | @@ -21,7 +21,7 @@ | ||
49 | |||
50 | int gam_subscription_get_reqno (GamSubscription *sub); | ||
51 | |||
52 | -G_CONST_RETURN char *gam_subscription_get_path (GamSubscription *sub); | ||
53 | +const char *gam_subscription_get_path (GamSubscription *sub); | ||
54 | |||
55 | GamListener *gam_subscription_get_listener (GamSubscription *sub); |