Mercurial > mplayer.hg

changeset 33508:72b4bbb515f3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename gtkIcon variables gdkIcon. Since they hold GDK objects this is the more appropriate name.
author ib
date Sun, 12 Jun 2011 06:56:43 +0000
parents 2a1a52ba0d70
children 645b0990ba4c
files gui/mplayer/widgets.c
diffstat 1 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- 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 );
  }