]>
Commit | Line | Data |
---|---|---|
7136207d | 1 | diff -ur exo-0.3.101.orig//exo/exo-string.c exo-0.3.101/exo/exo-string.c |
2 | --- exo-0.3.101.orig//exo/exo-string.c 2008-11-11 08:22:46.000000000 +0000 | |
3 | +++ exo-0.3.101/exo/exo-string.c 2011-12-13 11:11:20.613147984 +0000 | |
4 | @@ -400,7 +400,7 @@ | |
5 | * | |
6 | * Since: 0.3.1.1 | |
7 | */ | |
8 | -G_CONST_RETURN gchar* | |
9 | +const gchar* | |
10 | exo_intern_string (const gchar *string) | |
11 | { | |
12 | #if GLIB_CHECK_VERSION(2,9,0) | |
13 | @@ -425,7 +425,7 @@ | |
14 | * | |
15 | * Since: 0.3.1.1 | |
16 | */ | |
17 | -G_CONST_RETURN gchar* | |
18 | +const gchar* | |
19 | exo_intern_static_string (const gchar *string) | |
20 | { | |
21 | #if GLIB_CHECK_VERSION(2,9,0) | |
22 | diff -ur exo-0.3.101.orig//exo/exo-string.h exo-0.3.101/exo/exo-string.h | |
23 | --- exo-0.3.101.orig//exo/exo-string.h 2008-11-11 08:22:46.000000000 +0000 | |
24 | +++ exo-0.3.101/exo/exo-string.h 2011-12-13 11:11:25.292147864 +0000 | |
25 | @@ -46,8 +46,8 @@ | |
26 | gchar **exo_strndupv (gchar **strv, | |
27 | gint num) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT; | |
28 | ||
29 | -G_CONST_RETURN gchar *exo_intern_string (const gchar *string); | |
30 | -G_CONST_RETURN gchar *exo_intern_static_string (const gchar *string); | |
31 | +const gchar *exo_intern_string (const gchar *string); | |
32 | +const gchar *exo_intern_static_string (const gchar *string); | |
33 | ||
34 | #if GLIB_CHECK_VERSION(2,9,0) | |
35 | #define I_(string) (g_intern_static_string ((string))) | |
36 | diff -ur exo-0.3.101.orig//exo-support/xfce-heading.c exo-0.3.101/exo-support/xfce-heading.c | |
37 | --- exo-0.3.101.orig//exo-support/xfce-heading.c 2008-11-11 08:22:46.000000000 +0000 | |
38 | +++ exo-0.3.101/exo-support/xfce-heading.c 2011-12-13 11:10:58.620085167 +0000 | |
39 | @@ -609,7 +609,7 @@ | |
40 | * | |
41 | * Since: 4.4.0 | |
42 | **/ | |
43 | -G_CONST_RETURN gchar* | |
44 | +const gchar* | |
45 | xfce_heading_get_icon_name (XfceHeading *heading) | |
46 | { | |
47 | g_return_val_if_fail (XFCE_IS_HEADING (heading), NULL); | |
48 | @@ -662,7 +662,7 @@ | |
49 | * | |
50 | * Since: 4.4.0 | |
51 | **/ | |
52 | -G_CONST_RETURN gchar* | |
53 | +const gchar* | |
54 | xfce_heading_get_subtitle (XfceHeading *heading) | |
55 | { | |
56 | g_return_val_if_fail (XFCE_IS_HEADING (heading), NULL); | |
57 | @@ -713,7 +713,7 @@ | |
58 | * | |
59 | * Since: 4.4.0 | |
60 | **/ | |
61 | -G_CONST_RETURN gchar* | |
62 | +const gchar* | |
63 | xfce_heading_get_title (XfceHeading *heading) | |
64 | { | |
65 | g_return_val_if_fail (XFCE_IS_HEADING (heading), NULL); | |
66 | diff -ur exo-0.3.101.orig//exo-support/xfce-heading.h exo-0.3.101/exo-support/xfce-heading.h | |
67 | --- exo-0.3.101.orig//exo-support/xfce-heading.h 2008-11-11 08:22:46.000000000 +0000 | |
68 | +++ exo-0.3.101/exo-support/xfce-heading.h 2011-12-13 11:11:14.733022668 +0000 | |
69 | @@ -65,15 +65,15 @@ | |
70 | void xfce_heading_set_icon (XfceHeading *heading, | |
71 | GdkPixbuf *icon); | |
72 | ||
73 | -G_CONST_RETURN gchar *xfce_heading_get_icon_name (XfceHeading *heading); | |
74 | +const gchar *xfce_heading_get_icon_name (XfceHeading *heading); | |
75 | void xfce_heading_set_icon_name (XfceHeading *heading, | |
76 | const gchar *icon_name); | |
77 | ||
78 | -G_CONST_RETURN gchar *xfce_heading_get_subtitle (XfceHeading *heading); | |
79 | +const gchar *xfce_heading_get_subtitle (XfceHeading *heading); | |
80 | void xfce_heading_set_subtitle (XfceHeading *heading, | |
81 | const gchar *subtitle); | |
82 | ||
83 | -G_CONST_RETURN gchar *xfce_heading_get_title (XfceHeading *heading); | |
84 | +const gchar *xfce_heading_get_title (XfceHeading *heading); | |
85 | void xfce_heading_set_title (XfceHeading *heading, | |
86 | const gchar *title); | |
87 | ||
88 | diff -ur exo-0.3.101.orig//exo-support/xfce-titled-dialog.c exo-0.3.101/exo-support/xfce-titled-dialog.c | |
89 | --- exo-0.3.101.orig//exo-support/xfce-titled-dialog.c 2008-11-11 08:22:46.000000000 +0000 | |
90 | +++ exo-0.3.101/exo-support/xfce-titled-dialog.c 2011-12-13 11:11:07.323085371 +0000 | |
91 | @@ -328,7 +328,7 @@ | |
92 | * | |
93 | * Since: 4.4.0 | |
94 | **/ | |
95 | -G_CONST_RETURN gchar* | |
96 | +const gchar* | |
97 | xfce_titled_dialog_get_subtitle (XfceTitledDialog *titled_dialog) | |
98 | { | |
99 | g_return_val_if_fail (XFCE_IS_TITLED_DIALOG (titled_dialog), NULL); | |
100 | diff -ur exo-0.3.101.orig//exo-support/xfce-titled-dialog.h exo-0.3.101/exo-support/xfce-titled-dialog.h | |
101 | --- exo-0.3.101.orig//exo-support/xfce-titled-dialog.h 2008-11-11 08:22:46.000000000 +0000 | |
102 | +++ exo-0.3.101/exo-support/xfce-titled-dialog.h 2011-12-13 11:11:02.684085193 +0000 | |
103 | @@ -66,7 +66,7 @@ | |
104 | const gchar *first_button_text, | |
105 | ...) G_GNUC_MALLOC; | |
106 | ||
107 | -G_CONST_RETURN gchar *xfce_titled_dialog_get_subtitle (XfceTitledDialog *titled_dialog); | |
108 | +const gchar *xfce_titled_dialog_get_subtitle (XfceTitledDialog *titled_dialog); | |
109 | void xfce_titled_dialog_set_subtitle (XfceTitledDialog *titled_dialog, | |
110 | const gchar *subtitle); | |
111 |