glib r7775 - in trunk/gio: . xdgmime

[danw svn gnome org]

Author: danw
Date: Mon Jan  5 16:57:55 2009
New Revision: 7775
URL: http://svn.gnome.org/viewvc/glib?rev=7775&view=rev

Log:
	* gdesktopappinfo.c (update_mimeapps_list): cast a "char **" to
	"const char **" to avoid a warning.

	* gemblem.c (g_emblem_from_tokens):
	* gemblemedicon.c (g_emblemed_icon_from_tokens):
	* xdgmime/xdgmime.c (xdg_mime_get_icon): remove unused
	variables


Modified:
   trunk/gio/ChangeLog
   trunk/gio/gdesktopappinfo.c
   trunk/gio/gemblem.c
   trunk/gio/gemblemedicon.c
   trunk/gio/xdgmime/xdgmime.c

Modified: trunk/gio/gdesktopappinfo.c
==============================================================================
--- trunk/gio/gdesktopappinfo.c	(original)
+++ trunk/gio/gdesktopappinfo.c	Mon Jan  5 16:57:55 2009
@@ -1306,7 +1306,7 @@
 	     add the current list of (not yet listed) apps before it. */
 
 	  list[i] = NULL; /* Terminate current list so we can use it */
-	  system_list =  get_all_desktop_entries_for_mime_type (content_type, list);
+	  system_list =  get_all_desktop_entries_for_mime_type (content_type, (const char **)list);
 	  
 	  list = g_renew (char *, list, 1 + length + g_list_length (system_list) + 1);
 	  

Modified: trunk/gio/gemblem.c
==============================================================================
--- trunk/gio/gemblem.c	(original)
+++ trunk/gio/gemblem.c	Mon Jan  5 16:57:55 2009
@@ -314,7 +314,6 @@
   GEmblem *emblem;
   GIcon *icon;
   GEmblemOrigin origin;
-  char *s;
 
   emblem = NULL;
 

Modified: trunk/gio/gemblemedicon.c
==============================================================================
--- trunk/gio/gemblemedicon.c	(original)
+++ trunk/gio/gemblemedicon.c	Mon Jan  5 16:57:55 2009
@@ -283,7 +283,6 @@
                              GError **error)
 {
   GEmblemedIcon *emblemed_icon;
-  char *s;
   int n;
 
   emblemed_icon = NULL;

Modified: trunk/gio/xdgmime/xdgmime.c
==============================================================================
--- trunk/gio/xdgmime/xdgmime.c	(original)
+++ trunk/gio/xdgmime/xdgmime.c	Mon Jan  5 16:57:55 2009
@@ -906,8 +906,6 @@
 const char *
 xdg_mime_get_icon (const char *mime)
 {
-  const char *icon;
-
   xdg_mime_init ();
   
   if (_caches)