fix build on new ubuntu

Den Raskovalov <[email protected]> Sat, 10 Mar 2012 16:05:05 -0800
Newsgroups gmane.comp.ipod.gtkpod
Message-ID <[email protected]> 
Hi

I know that my contribution is trivial, but. I've patched libgpod 
sources for new glib (need it to build libgpod on
new ubuntu 12.04). I've attached my patch.

-----
Thank you,
Den

------------------------------------------------------------------------------
Virtualization & Cloud Management Using Capacity Planning
Cloud computing makes use of virtualization - but cloud computing 
also focuses on allowing computing to be delivered as a service.
http://www.accelacomm.com/jaw/sfnl/114/51521223/

_______________________________________________
Gtkpod-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-devel
libgpod.patch (text/x-patch, 2.3 KB) 
diff --git a/src/db-parse-context.c b/src/db-parse-context.c
index 88009c9..789b3e9 100644
--- a/src/db-parse-context.c
+++ b/src/db-parse-context.c
@@ -64,7 +64,7 @@ db_parse_context_destroy (DBParseContext *ctx)
 	g_return_if_fail (ctx != NULL);
 
 	if (ctx->mapped_file) {
-		g_mapped_file_free(ctx->mapped_file);
+		g_mapped_file_unref(ctx->mapped_file);
 	}
 
 	g_free (ctx);
@@ -215,7 +215,7 @@ db_parse_context_new_from_file (const char *filename, Itdb_DB *db)
 					device->byte_order);
 
 	if (ctx == NULL) {
-		g_mapped_file_free(mapped_file);
+		g_mapped_file_unref(mapped_file);
 		return NULL;
 	}
 	ctx->db = db;
diff --git a/tests/itdb_main.c b/tests/itdb_main.c
index e7723bb..8186b88 100644
--- a/tests/itdb_main.c
+++ b/tests/itdb_main.c
@@ -55,7 +55,7 @@ main (int argc, char *argv[])
 
   if (infile == 0)
   {
-      printf ("Usage: %s <infile> [<outfile>]\n",  g_basename(argv[0]));
+      printf ("Usage: %s <infile> [<outfile>]\n",  g_path_get_basename(argv[0]));
       exit (0);
   }
 
diff --git a/tests/test-fw-id.c b/tests/test-fw-id.c
index 7490001..dbf1b0a 100644
--- a/tests/test-fw-id.c
+++ b/tests/test-fw-id.c
@@ -42,7 +42,7 @@ main (int argc, char *argv[])
     char *fwid;
 
     if (argc < 2) {
-        g_print ("Usage: %s <mountpoint>\n", g_basename (argv[0]));
+        g_print ("Usage: %s <mountpoint>\n", g_path_get_basename(argv[0]));
         return 1;
 
     }
diff --git a/tests/test-ls.c b/tests/test-ls.c
index e28cd9c..8a5aa10 100644
--- a/tests/test-ls.c
+++ b/tests/test-ls.c
@@ -121,7 +121,7 @@ main (int argc, char *argv[])
       g_print ("Usage: %s <mountpoint>|-l [<playlistname>]\n\n"
                "-l - List from the local repository (~" LOCALDB ")\n"
 	       "<playlistname> - name of the playlist to list (optional)\n",  
-                g_basename(argv[0]));
+                g_path_get_basename(argv[0]));
       exit (0);
   }
 
diff --git a/tools/read-sysinfoextended.c b/tools/read-sysinfoextended.c
index b3afd2c..97e5dba 100644
--- a/tools/read-sysinfoextended.c
+++ b/tools/read-sysinfoextended.c
@@ -78,7 +78,7 @@ main (int argc, char **argv)
     char *xml;
     
     if (argc < 3) {
-      g_print (_("usage: %s <device|uuid|bus device> <mountpoint>\n"), g_basename (argv[0]));
+      g_print (_("usage: %s <device|uuid|bus device> <mountpoint>\n"), g_path_get_basename(argv[0]));
 	return 1;
     }