[MPlayer-cvslog] r33596 - trunk/gui/mplayer/widgets.c

[ib]

Author: ib
Date: Sun Jun 12 08:56:43 2011
New Revision: 33596

Log:
Rename gtkIcon variables gdkIcon.

Since they hold GDK objects this is the more appropriate name.

Modified:
   trunk/gui/mplayer/widgets.c

Modified: trunk/gui/mplayer/widgets.c
==============================================================================
--- trunk/gui/mplayer/widgets.c	Sun Jun 12 08:48:10 2011	(r33595)
+++ trunk/gui/mplayer/widgets.c	Sun Jun 12 08:56:43 2011	(r33596)
@@ -69,8 +69,8 @@ int gtkInitialized = 0;
 
 // --- init & close gtk
 
-static GdkPixmap * gtkIcon;
-static GdkBitmap * gtkIconMask;
+static GdkPixmap * gdkIcon;
+static GdkBitmap * gdkIconMask;
 Pixmap	    guiIcon;
 Pixmap	    guiIconMask;
 
@@ -98,11 +98,11 @@ void gtkInit( void )
   GtkWidget * win;
   win=gtk_window_new( GTK_WINDOW_TOPLEVEL );
 
-  if ( !gtkIcon )
-    gtkIcon=gdk_pixmap_colormap_create_from_xpm_d( win->window,gdk_colormap_get_system(),&gtkIconMask,&win->style->bg[GTK_STATE_NORMAL],(gchar **) mplayer_xpm );
+  if ( !gdkIcon )
+    gdkIcon=gdk_pixmap_colormap_create_from_xpm_d( win->window,gdk_colormap_get_system(),&gdkIconMask,&win->style->bg[GTK_STATE_NORMAL],(gchar **) mplayer_xpm );
 
-  guiIcon=GDK_WINDOW_XWINDOW( gtkIcon );
-  guiIconMask=GDK_WINDOW_XWINDOW( gtkIconMask );
+  guiIcon=GDK_WINDOW_XWINDOW( gdkIcon );
+  guiIconMask=GDK_WINDOW_XWINDOW( gdkIconMask );
 
   gtk_widget_destroy( win );
  }