empathy r1695 - trunk/libempathy-gtk

[xclaesse svn gnome org]

Author: xclaesse
Date: Tue Nov 11 15:27:14 2008
New Revision: 1695
URL: http://svn.gnome.org/viewvc/empathy?rev=1695&view=rev

Log:
Use l and strv for list and strv iterators, not i and j

Modified:
   trunk/libempathy-gtk/empathy-avatar-chooser.c

Modified: trunk/libempathy-gtk/empathy-avatar-chooser.c
==============================================================================
--- trunk/libempathy-gtk/empathy-avatar-chooser.c	(original)
+++ trunk/libempathy-gtk/empathy-avatar-chooser.c	Tue Nov 11 15:27:14 2008
@@ -310,8 +310,8 @@
 				    gchar **satisfactory_mime_type)
 {
 	GSList *formats;
-	GSList *i;
-	gchar **j;
+	GSList *l;
+	gchar **strv;
 	gboolean done = FALSE;
 
 	if (accepted_mime_types == NULL || *accepted_mime_types == NULL) {
@@ -323,8 +323,8 @@
 
 	formats = gdk_pixbuf_get_formats ();
 
-	for (i = formats; !done && i != NULL; i = i->next) {
-		GdkPixbufFormat *format = i->data;
+	for (l = formats; !done && l != NULL; l = l->next) {
+		GdkPixbufFormat *format = l->data;
 		gchar **format_mime_types;
 
 		if (!gdk_pixbuf_format_is_writable (format)) {
@@ -332,10 +332,10 @@
 		}
 
 		format_mime_types = gdk_pixbuf_format_get_mime_types (format);
-		for (j = accepted_mime_types; *j != NULL; j++) {
-			if (str_in_strv (*j, format_mime_types)) {
+		for (strv = accepted_mime_types; *strv != NULL; strv++) {
+			if (str_in_strv (*strv, format_mime_types)) {
 				*satisfactory_format_name = gdk_pixbuf_format_get_name (format);
-				*satisfactory_mime_type = g_strdup (*j);
+				*satisfactory_mime_type = g_strdup (*strv);
 				done = TRUE;
 				break;
 			}