--- plugins/photo_editor/display_photo.c.orig	2012-07-14 22:32:53.000000000 -0500
+++ plugins/photo_editor/display_photo.c	2012-07-14 22:33:31.000000000 -0500
@@ -1153,7 +1153,7 @@
     /* 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;
 
--- libgtkpod/file.c.orig	2012-07-14 22:32:15.000000000 -0500
+++ libgtkpod/file.c	2012-07-14 22:35:14.000000000 -0500
@@ -395,7 +395,7 @@
         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) {
--- libgtkpod/misc.c.orig	2012-07-14 22:32:22.000000000 -0500
+++ libgtkpod/misc.c	2012-07-14 22:37:31.000000000 -0500
@@ -161,7 +161,7 @@
 /* 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);
--- libgtkpod/misc.h.orig	2012-07-14 22:32:32.000000000 -0500
+++ libgtkpod/misc.h	2012-07-14 22:38:38.000000000 -0500
@@ -80,9 +80,9 @@
 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);
--- libgtkpod/syncdir.c.orig	2012-07-14 22:32:40.000000000 -0500
+++ libgtkpod/syncdir.c	2012-07-14 22:39:42.000000000 -0500
@@ -319,7 +319,7 @@
     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);