Mercurial > mplayer.hg

diff gui/dialog/skinbrowser.c @ 36776:5ea757ca6270

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix careless pointer parameter handling. User proper GLib macros to avoid pointer cast warnings. This renders the usage of intptr_t redundant (introduced in r36858).
author ib
date Mon, 17 Feb 2014 02:30:49 +0000
parents e788bcd9d49b
children d8b2651bfeab
line wrap: on
line diff
--- a/gui/dialog/skinbrowser.c	Mon Feb 17 01:28:05 2014 +0000
+++ b/gui/dialog/skinbrowser.c	Mon Feb 17 02:30:49 2014 +0000
@@ -51,7 +51,7 @@
 
  if ( sbSelectedSkin )
  {
-  switch ( (intptr_t)user_data )
+  switch ( GPOINTER_TO_INT(user_data) )
    {
     case 0: // cancel
 	if ( strcmp( sbSelectedSkin,gtkOldSkin ) ) uiChangeSkin( gtkOldSkin );
@@ -145,8 +145,8 @@
 
  gtk_signal_connect( GTK_OBJECT( SkinBrowser ),"destroy",GTK_SIGNAL_FUNC( gtk_widget_destroyed ),&SkinBrowser );
  gtk_signal_connect( GTK_OBJECT( SkinList ),"select-row",GTK_SIGNAL_FUNC( on_SkinList_select_row ),NULL );
- gtk_signal_connect( GTK_OBJECT( Ok ),"clicked",GTK_SIGNAL_FUNC( prButton ),(void *)1 );
- gtk_signal_connect( GTK_OBJECT( Cancel ),"clicked",GTK_SIGNAL_FUNC( prButton ),(void *)0 );
+ gtk_signal_connect( GTK_OBJECT( Ok ),"clicked",GTK_SIGNAL_FUNC( prButton ),GINT_TO_POINTER(1) );
+ gtk_signal_connect( GTK_OBJECT( Cancel ),"clicked",GTK_SIGNAL_FUNC( prButton ),GINT_TO_POINTER(0) );
 
  if ( ( sbSkinDirInHome=calloc( 1,strlen( skinDirInHome ) + 4 ) ) != NULL )
   { strcpy( sbSkinDirInHome,skinDirInHome ); strcat( sbSkinDirInHome,"/*" ); }