Skip to content

Commit ec6a212

Browse files
committed
FIX: support gcc14 -Werror=incompatible-pointer-types
gcc14 now defaults to -Werror=incompatible-pointer-types . To support this, cast GTK related objects for assignment properly. Fixes lxde#100 .
1 parent 5346a53 commit ec6a212

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

src/gtk/exo/exo-icon-view.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -2819,7 +2819,7 @@ exo_icon_view_key_press_event (GtkWidget *widget,
28192819
/* allocate a new event to forward */
28202820
new_event = gdk_event_copy ((GdkEvent *) event);
28212821
g_object_unref (G_OBJECT (new_event->key.window));
2822-
new_event->key.window = g_object_ref (G_OBJECT (gtk_widget_get_window (icon_view->priv->search_entry)));
2822+
new_event->key.window = GDK_WINDOW(g_object_ref (G_OBJECT (gtk_widget_get_window (icon_view->priv->search_entry))));
28232823

28242824
/* send the event to the search entry. If the "preedit-changed" signal is
28252825
* emitted during this event, priv->search_imcontext_changed will be set.

src/gtk/fm-dnd-dest.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,7 @@ static GdkDragAction _ask_action_on_drop(GtkWidget *widget,
458458
gtk_action_set_sensitive(act, FALSE);
459459
}
460460
}
461-
ri.menu = g_object_ref(gtk_ui_manager_get_widget(ui, "/popup"));
461+
ri.menu = GTK_MENU(g_object_ref(gtk_ui_manager_get_widget(ui, "/popup")));
462462
g_signal_connect(ri.menu, "selection-done", G_CALLBACK(gtk_widget_destroy), NULL);
463463
unmap_handler = g_signal_connect(ri.menu, "unmap",
464464
G_CALLBACK(run_unmap_handler), &ri);

src/gtk/fm-standard-view.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -637,7 +637,7 @@ static inline void create_icon_view(FmStandardView* fv, GList* sels)
637637
"text", FM_FOLDER_MODEL_COL_NAME );
638638
if(fv->renderer_text)
639639
g_object_unref(fv->renderer_text);
640-
fv->renderer_text = g_object_ref_sink(render);
640+
fv->renderer_text = FM_CELL_RENDERER_TEXT(g_object_ref_sink(render));
641641
exo_icon_view_set_search_column((ExoIconView*)fv->view, FM_FOLDER_MODEL_COL_NAME);
642642
g_signal_connect(fv->view, "item-activated", G_CALLBACK(on_icon_view_item_activated), fv);
643643
g_signal_connect(fv->view, "selection-changed", G_CALLBACK(on_sel_changed), fv);

0 commit comments

Comments
 (0)