diff options
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/gtkmain.c | 10 | ||||
| -rw-r--r-- | gtk/gtkmodules.c | 9 | ||||
| -rw-r--r-- | gtk/gtkselection.c | 4 | ||||
| -rw-r--r-- | gtk/gtktipsquery.c | 6 | ||||
| -rw-r--r-- | gtk/queryimmodules.c | 18 |
5 files changed, 37 insertions, 10 deletions
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c index 47207d3a20..584265645d 100644 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c @@ -1358,6 +1358,7 @@ rewrite_event_for_grabs (GdkEvent *event) { GdkWindow *grab_window; GtkWidget *event_widget, *grab_widget; + gpointer grab_widget_ptr; gboolean owner_events; GdkDisplay *display; @@ -1390,7 +1391,8 @@ rewrite_event_for_grabs (GdkEvent *event) } event_widget = gtk_get_event_widget (event); - gdk_window_get_user_data (grab_window, (void**) &grab_widget); + gdk_window_get_user_data (grab_window, &grab_widget_ptr); + grab_widget = grab_widget_ptr; if (grab_widget && gtk_main_get_window_group (grab_widget) != gtk_main_get_window_group (event_widget)) @@ -2227,11 +2229,15 @@ GtkWidget* gtk_get_event_widget (GdkEvent *event) { GtkWidget *widget; + gpointer widget_ptr; widget = NULL; if (event && event->any.window && (event->type == GDK_DESTROY || !GDK_WINDOW_DESTROYED (event->any.window))) - gdk_window_get_user_data (event->any.window, (void**) &widget); + { + gdk_window_get_user_data (event->any.window, &widget_ptr); + widget = widget_ptr; + } return widget; } diff --git a/gtk/gtkmodules.c b/gtk/gtkmodules.c index 526a5b8c3a..0cac9634f4 100644 --- a/gtk/gtkmodules.c +++ b/gtk/gtkmodules.c @@ -254,6 +254,7 @@ load_module (GSList *module_list, const gchar *name) { GtkModuleInitFunc modinit_func; + gpointer modinit_func_ptr; GtkModuleInfo *info = NULL; GModule *module = NULL; GSList *l; @@ -279,8 +280,12 @@ load_module (GSList *module_list, if (module) { - if (!g_module_symbol (module, "gtk_module_init", (gpointer *) &modinit_func) || - !modinit_func) + if (g_module_symbol (module, "gtk_module_init", &modinit_func_ptr)) + modinit_func = modinit_func_ptr; + else + modinit_func = NULL; + + if (!modinit_func) g_module_close (module); else { diff --git a/gtk/gtkselection.c b/gtk/gtkselection.c index 56c14473fc..fc222f9915 100644 --- a/gtk/gtkselection.c +++ b/gtk/gtkselection.c @@ -1067,6 +1067,7 @@ gtk_selection_convert (GtkWidget *widget, if (owner_window != NULL) { GtkWidget *owner_widget; + gpointer owner_widget_ptr; GtkSelectionData selection_data; selection_data.selection = selection; @@ -1075,7 +1076,8 @@ gtk_selection_convert (GtkWidget *widget, selection_data.length = -1; selection_data.display = display; - gdk_window_get_user_data (owner_window, (gpointer *)&owner_widget); + gdk_window_get_user_data (owner_window, &owner_widget_ptr); + owner_widget = owner_widget_ptr; if (owner_widget != NULL) { diff --git a/gtk/gtktipsquery.c b/gtk/gtktipsquery.c index 52a329ee2c..e80796efeb 100644 --- a/gtk/gtktipsquery.c +++ b/gtk/gtktipsquery.c @@ -470,7 +470,11 @@ gtk_tips_query_event (GtkWidget *widget, pointer_window = NULL; event_widget = NULL; if (pointer_window) - gdk_window_get_user_data (pointer_window, (gpointer*) &event_widget); + { + gpointer event_widget_ptr; + gdk_window_get_user_data (pointer_window, &event_widget_ptr); + event_widget = event_widget_ptr; + } gtk_tips_query_emit_widget_entered (tips_query, event_widget); event_handled = TRUE; break; diff --git a/gtk/queryimmodules.c b/gtk/queryimmodules.c index 6b87002e33..5369c7f9bd 100644 --- a/gtk/queryimmodules.c +++ b/gtk/queryimmodules.c @@ -94,6 +94,11 @@ query_module (const char *dir, const char *name) void (*exit) (void); GtkIMContext *(*create) (const gchar *context_id); + gpointer list_ptr; + gpointer init_ptr; + gpointer exit_ptr; + gpointer create_ptr; + GModule *module; gchar *path; gboolean error = FALSE; @@ -112,15 +117,20 @@ query_module (const char *dir, const char *name) } if (module && - g_module_symbol (module, "im_module_list", (gpointer *) &list) && - g_module_symbol (module, "im_module_init", (gpointer *) &init) && - g_module_symbol (module, "im_module_exit", (gpointer *) &exit) && - g_module_symbol (module, "im_module_create", (gpointer *) &create)) + g_module_symbol (module, "im_module_list", &list_ptr) && + g_module_symbol (module, "im_module_init", &init_ptr) && + g_module_symbol (module, "im_module_exit", &exit_ptr) && + g_module_symbol (module, "im_module_create", &create_ptr)) { const GtkIMContextInfo **contexts; guint n_contexts; int i; + list = list_ptr; + init = init_ptr; + exit = exit_ptr; + create = create_ptr; + print_escaped (path); fputs ("\n", stdout); |