Search
j0ke.net Open Build Service
>
Projects
>
multimedia
:
EL5
>
xmms
> xmms-ptr_int_casts.diff
Sign Up
|
Log In
Username
Password
Cancel
Overview
Repositories
Revisions
Requests
Users
Advanced
Attributes
Meta
File xmms-ptr_int_casts.diff of Package xmms
--- General/joystick/configure.c +++ General/joystick/configure.c @@ -34,17 +34,17 @@ { int i; joy_cfg.sens = atoi(gtk_entry_get_text(GTK_ENTRY(sens_entry))); - joy_cfg.up = (gint) gtk_object_get_data(GTK_OBJECT(gtk_menu_get_active(GTK_MENU(joy_menus[0]))), "cmd"); - joy_cfg.down = (gint) gtk_object_get_data(GTK_OBJECT(gtk_menu_get_active(GTK_MENU(joy_menus[1]))), "cmd"); - joy_cfg.left = (gint) gtk_object_get_data(GTK_OBJECT(gtk_menu_get_active(GTK_MENU(joy_menus[2]))), "cmd"); - joy_cfg.right = (gint) gtk_object_get_data(GTK_OBJECT(gtk_menu_get_active(GTK_MENU(joy_menus[3]))), "cmd"); - joy_cfg.alt_up = (gint) gtk_object_get_data(GTK_OBJECT(gtk_menu_get_active(GTK_MENU(joy_menus[4]))), "cmd"); - joy_cfg.alt_down = (gint) gtk_object_get_data(GTK_OBJECT(gtk_menu_get_active(GTK_MENU(joy_menus[5]))), "cmd"); - joy_cfg.alt_left = (gint) gtk_object_get_data(GTK_OBJECT(gtk_menu_get_active(GTK_MENU(joy_menus[6]))), "cmd"); - joy_cfg.alt_right = (gint) gtk_object_get_data(GTK_OBJECT(gtk_menu_get_active(GTK_MENU(joy_menus[7]))), "cmd"); + joy_cfg.up = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(gtk_menu_get_active(GTK_MENU(joy_menus[0]))), "cmd")); + joy_cfg.down = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(gtk_menu_get_active(GTK_MENU(joy_menus[1]))), "cmd")); + joy_cfg.left = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(gtk_menu_get_active(GTK_MENU(joy_menus[2]))), "cmd")); + joy_cfg.right = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(gtk_menu_get_active(GTK_MENU(joy_menus[3]))), "cmd")); + joy_cfg.alt_up = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(gtk_menu_get_active(GTK_MENU(joy_menus[4]))), "cmd")); + joy_cfg.alt_down = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(gtk_menu_get_active(GTK_MENU(joy_menus[5]))), "cmd")); + joy_cfg.alt_left = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(gtk_menu_get_active(GTK_MENU(joy_menus[6]))), "cmd")); + joy_cfg.alt_right = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(gtk_menu_get_active(GTK_MENU(joy_menus[7]))), "cmd")); for (i = 0; i < joy_cfg.num_buttons; i++) { - joy_cfg.button_cmd[i] = (gint)gtk_object_get_data(GTK_OBJECT(gtk_menu_get_active(GTK_MENU(joy_menus[8+i]))), "cmd"); + joy_cfg.button_cmd[i] = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(gtk_menu_get_active(GTK_MENU(joy_menus[8+i]))), "cmd")); } } @@ -173,7 +173,7 @@ for (i = 0; i < num_menu_txt; i++) { item = gtk_menu_item_new_with_label(_(menu_txt[i])); - gtk_object_set_data(GTK_OBJECT(item), "cmd", (gpointer) i); + gtk_object_set_data(GTK_OBJECT(item), "cmd", GINT_TO_POINTER(i)); gtk_widget_show(item); gtk_menu_append(GTK_MENU(joy_menus[j]), item); } --- Output/OSS/configure.c +++ Output/OSS/configure.c @@ -234,7 +234,7 @@ } else item = gtk_menu_item_new_with_label(buffer); - gtk_signal_connect(GTK_OBJECT(item), "activate", sigfunc, (gpointer) index++); + gtk_signal_connect(GTK_OBJECT(item), "activate", sigfunc, GINT_TO_POINTER(index++)); gtk_widget_show(item); gtk_menu_append(GTK_MENU(menu), item); } @@ -263,7 +263,7 @@ temp = g_strdup_printf ("%s", info.name); item = gtk_menu_item_new_with_label (temp); g_free (temp); - gtk_signal_connect(GTK_OBJECT(item), "activate", sigfunc, (gpointer) index++); + gtk_signal_connect(GTK_OBJECT(item), "activate", sigfunc, GINT_TO_POINTER(index++)); gtk_widget_show(item); gtk_menu_append(GTK_MENU(menu), item); }
