commit f3e5ee8f0fe1586740de3a220367ebe1d8df4afe
Author: phantomjinx <[email protected]>
Date: Tue Aug 2 21:45:28 2011 +0100
G_CONST_RETURN has been deprecated / removed in gtk3
* See bug 3383824. Thanks to the contributor of the bug for the patch.
libgtkpod/file.c | 2 +-
libgtkpod/misc.c | 2 +-
libgtkpod/misc.h | 6 +++---
libgtkpod/syncdir.c | 2 +-
plugins/photo_editor/display_photo.c | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/libgtkpod/file.c b/libgtkpod/file.c
index 65d3026..7eed815 100644
--- a/libgtkpod/file.c
+++ b/libgtkpod/file.c
@@ -394,7 +394,7 @@ gint add_directory_by_name(iTunesDB *itdb, gchar *name,
Playlist *plitem, gboole
GDir *dir = g_dir_open(name, 0, NULL);
block_widgets();
if (dir != NULL) {
- G_CONST_RETURN gchar *next;
+ const gchar *next;
do {
next = g_dir_read_name(dir);
if (next != NULL) {
diff --git a/libgtkpod/misc.c b/libgtkpod/misc.c
index e1b3d36..bd5b757 100644
--- a/libgtkpod/misc.c
+++ b/libgtkpod/misc.c
@@ -161,7 +161,7 @@ void update_blocked_widget(GtkWidget *w, gboolean sens) {
/* Concats @base_dir and @rel_dir if and only if @rel_dir is not
* absolute (does not start with '~' or '/'). Otherwise simply return
* a copy of @rel_dir. Must free return value after use */
-gchar *concat_dir_if_relative(G_CONST_RETURN gchar *base_dir, G_CONST_RETURN
gchar *rel_dir) {
+gchar *concat_dir_if_relative(const gchar *base_dir, const gchar *rel_dir) {
/* sanity */
if (!rel_dir || !*rel_dir)
return g_build_filename(base_dir, rel_dir, NULL);
diff --git a/libgtkpod/misc.h b/libgtkpod/misc.h
index 18741f9..8455ef1 100644
--- a/libgtkpod/misc.h
+++ b/libgtkpod/misc.h
@@ -80,9 +80,9 @@ Playlist *add_new_pl_user_name (iTunesDB *itdb, gchar *dflt,
gint32 pos);
void add_new_pl_or_spl_user_name (iTunesDB *itdb, gchar *dflt, gint32 pos);
void create_add_files_fileselector (void);
void create_add_playlists_fileselector (void);
-gchar *concat_dir (G_CONST_RETURN gchar *dir, G_CONST_RETURN gchar *file);
-gchar *concat_dir_if_relative (G_CONST_RETURN gchar *base_dir,
- G_CONST_RETURN gchar *rel_dir);
+gchar *concat_dir (const gchar *dir, const gchar *file);
+gchar *concat_dir_if_relative (const gchar *base_dir,
+ const gchar *rel_dir);
float get_ms_since (GTimeVal *old_time, gboolean update);
gint get_sort_tab_number (gchar *text);
gboolean parse_tracks_from_string (gchar **s, Track **track);
diff --git a/libgtkpod/syncdir.c b/libgtkpod/syncdir.c
index 2ae3216..29bc524 100644
--- a/libgtkpod/syncdir.c
+++ b/libgtkpod/syncdir.c
@@ -318,7 +318,7 @@ static void add_files(gpointer key, gpointer value,
gpointer user_data) {
if (g_file_test(dirname, G_FILE_TEST_IS_DIR)) {
GDir *dir = g_dir_open(dirname, 0, NULL);
if (dir != NULL) {
- G_CONST_RETURN gchar *next;
+ const gchar *next;
while ((next = g_dir_read_name(dir))) {
gchar *filename = g_build_filename(dirname, next, NULL);
FileType *filetype = determine_filetype(filename);
diff --git a/plugins/photo_editor/display_photo.c
b/plugins/photo_editor/display_photo.c
index 322c792..520c124 100644
--- a/plugins/photo_editor/display_photo.c
+++ b/plugins/photo_editor/display_photo.c
@@ -1153,7 +1153,7 @@ static void
on_photodb_add_image_dir_menuItem_activate(GtkMenuItem *menuItem, gp
/* Leaf through all the files inside the directory and check if they are
image
* files. If they are then add them to the database.
*/
- G_CONST_RETURN gchar *filename;
+ const gchar *filename;
GPtrArray* filename_arr = g_ptr_array_new();
unsigned u;
------------------------------------------------------------------------------
BlackBerry® DevCon Americas, Oct. 18-20, San Francisco, CA
The must-attend event for mobile developers. Connect with experts.
Get tools for creating Super Apps. See the latest technologies.
Sessions, hands-on labs, demos & much more. Register early & save!
http://p.sf.net/sfu/rim-blackberry-1
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
