# HG changeset patch
# User ib
# Date 1307861803 0
# Node ID 72b4bbb515f36eeb32aec7f8c853e2e4595e3039
# Parent  2a1a52ba0d70ebbe941620a5ef6a24173f9aadfd
Rename gtkIcon variables gdkIcon.

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

diff -r 2a1a52ba0d70 -r 72b4bbb515f3 gui/mplayer/widgets.c
--- a/gui/mplayer/widgets.c	Sun Jun 12 06:48:10 2011 +0000
+++ b/gui/mplayer/widgets.c	Sun Jun 12 06:56:43 2011 +0000
@@ -69,8 +69,8 @@
 
 // --- init & close gtk
 
-static GdkPixmap * gtkIcon;
-static GdkBitmap * gtkIconMask;
+static GdkPixmap * gdkIcon;
+static GdkBitmap * gdkIconMask;
 Pixmap	    guiIcon;
 Pixmap	    guiIconMask;
 
@@ -98,11 +98,11 @@
   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 );
  }