[MPlayer-cvslog] r33836 - in trunk/gui: cfg.c ui/gtk/url.c util/list.c util/list.h

[ib]

Author: ib
Date: Thu Jul  7 16:13:17 2011
New Revision: 33836

Log:
Cosmetic: Rename URLList urlList.

Modified:
   trunk/gui/cfg.c
   trunk/gui/ui/gtk/url.c
   trunk/gui/util/list.c
   trunk/gui/util/list.h

Modified: trunk/gui/cfg.c
==============================================================================
--- trunk/gui/cfg.c	Thu Jul  7 16:09:57 2011	(r33835)
+++ trunk/gui/cfg.c	Thu Jul  7 16:13:17 2011	(r33836)
@@ -421,11 +421,11 @@ int cfg_write(void)
     f   = fopen(cfg, "wt+");
 
     if (f) {
-        while (URLList) {
-            if (URLList->url)
-                fprintf(f, "%s\n", URLList->url);
+        while (urlList) {
+            if (urlList->url)
+                fprintf(f, "%s\n", urlList->url);
 
-            URLList = URLList->next;
+            urlList = urlList->next;
         }
 
         fclose(f);

Modified: trunk/gui/ui/gtk/url.c
==============================================================================
--- trunk/gui/ui/gtk/url.c	Thu Jul  7 16:09:57 2011	(r33835)
+++ trunk/gui/ui/gtk/url.c	Thu Jul  7 16:13:17 2011	(r33836)
@@ -47,9 +47,9 @@ void ShowURLDialogBox( void )
  if ( URL ) gtkActive( URL );
    else URL=create_URL();
 
- if ( URLList )
+ if ( urlList )
   {
-   urlItem * item = URLList;
+   urlItem * item = urlList;
    g_list_free( URLComboEntrys );
    URLComboEntrys=NULL;
    while( item )

Modified: trunk/gui/util/list.c
==============================================================================
--- trunk/gui/util/list.c	Thu Jul  7 16:09:57 2011	(r33835)
+++ trunk/gui/util/list.c	Thu Jul  7 16:13:17 2011	(r33836)
@@ -26,7 +26,7 @@ plItem *plList;
 plItem *plCurrent;
 plItem *plLastPlayed;
 
-urlItem *URLList;
+urlItem *urlList;
 
 void *listSet(int cmd, void *vparam)
 {
@@ -167,8 +167,8 @@ void *listSet(int cmd, void *vparam)
 
     // handle url
     case gtkAddURLItem:
-        if (URLList) {
-            urlItem *next_url = URLList;
+        if (urlList) {
+            urlItem *next_url = urlList;
             is_added = 0;
 
             while (next_url->next) {
@@ -184,7 +184,7 @@ void *listSet(int cmd, void *vparam)
                 next_url->next = url_item;
         } else {
             url_item->next = NULL;
-            URLList = url_item;
+            urlList = url_item;
         }
         return NULL;
     }

Modified: trunk/gui/util/list.h
==============================================================================
--- trunk/gui/util/list.h	Thu Jul  7 16:09:57 2011	(r33835)
+++ trunk/gui/util/list.h	Thu Jul  7 16:13:17 2011	(r33836)
@@ -44,7 +44,7 @@ extern plItem *plList;
 extern plItem *plCurrent;
 extern plItem *plLastPlayed;
 
-extern urlItem *URLList;
+extern urlItem *urlList;
 
 void gaddlist(char ***list, const char *entry);
 void greplace(char ***list, const char *search, const char *replace);