forked from pool/libfm
Michael Vetter
8d796e219b
* Updated translations. * Fixed a vulnerability related to trusted locations. * GCC 14 compilation support. * Updated the list of mime types handled by xarchiver. * Removed mime type definitions provided by shared-mime-info. * Terminals in terminals.list are allowed to have no open_arg entry. * Added germinal, kitty, mintty, and alacritty to terminals.list. * Added a setting for the ISO 8601 date format. * Fixed not setting $DISPLAY on Wayland. * Added a setting to open files with a single middle-click. * Fixed various drag and drop bugs with XDirectSave. * Added a missing filter name. * Enabled smooth scrolling. * Fixed background color with GTK3. * Increased the width of the file properties dialog. * Added the MIME type to the file properties dialog. * Source cache is now cleared after data drop. * Corrected check for the stamp file to rebuild the vala code. - Drop upstreamed: fix-gcc14.patch OBS-URL: https://build.opensuse.org/package/show/X11:lxde/libfm?expand=0&rev=212
52 lines
2.5 KiB
Diff
52 lines
2.5 KiB
Diff
commit fbcd183335729fa3e8dd6a837c13a23ff3271000
|
|
Author: Mamoru TASAKA <mtasaka@fedoraproject.org>
|
|
Date: Fri Mar 1 14:19:46 2024 +0900
|
|
|
|
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 #100 .
|
|
|
|
diff --git a/src/gtk/exo/exo-icon-view.c b/src/gtk/exo/exo-icon-view.c
|
|
index 3ce98099..79e1c7ab 100644
|
|
--- a/src/gtk/exo/exo-icon-view.c
|
|
+++ b/src/gtk/exo/exo-icon-view.c
|
|
@@ -2819,7 +2819,7 @@ exo_icon_view_key_press_event (GtkWidget *widget,
|
|
/* allocate a new event to forward */
|
|
new_event = gdk_event_copy ((GdkEvent *) event);
|
|
g_object_unref (G_OBJECT (new_event->key.window));
|
|
- new_event->key.window = g_object_ref (G_OBJECT (gtk_widget_get_window (icon_view->priv->search_entry)));
|
|
+ new_event->key.window = GDK_WINDOW(g_object_ref (G_OBJECT (gtk_widget_get_window (icon_view->priv->search_entry))));
|
|
|
|
/* send the event to the search entry. If the "preedit-changed" signal is
|
|
* emitted during this event, priv->search_imcontext_changed will be set.
|
|
diff --git a/src/gtk/fm-dnd-dest.c b/src/gtk/fm-dnd-dest.c
|
|
index 95d310d3..ce752758 100644
|
|
--- a/src/gtk/fm-dnd-dest.c
|
|
+++ b/src/gtk/fm-dnd-dest.c
|
|
@@ -458,7 +458,7 @@ static GdkDragAction _ask_action_on_drop(GtkWidget *widget,
|
|
gtk_action_set_sensitive(act, FALSE);
|
|
}
|
|
}
|
|
- ri.menu = g_object_ref(gtk_ui_manager_get_widget(ui, "/popup"));
|
|
+ ri.menu = GTK_MENU(g_object_ref(gtk_ui_manager_get_widget(ui, "/popup")));
|
|
g_signal_connect(ri.menu, "selection-done", G_CALLBACK(gtk_widget_destroy), NULL);
|
|
unmap_handler = g_signal_connect(ri.menu, "unmap",
|
|
G_CALLBACK(run_unmap_handler), &ri);
|
|
diff --git a/src/gtk/fm-standard-view.c b/src/gtk/fm-standard-view.c
|
|
index e0ff5a06..df920254 100644
|
|
--- a/src/gtk/fm-standard-view.c
|
|
+++ b/src/gtk/fm-standard-view.c
|
|
@@ -637,7 +637,7 @@ static inline void create_icon_view(FmStandardView* fv, GList* sels)
|
|
"text", FM_FOLDER_MODEL_COL_NAME );
|
|
if(fv->renderer_text)
|
|
g_object_unref(fv->renderer_text);
|
|
- fv->renderer_text = g_object_ref_sink(render);
|
|
+ fv->renderer_text = FM_CELL_RENDERER_TEXT(g_object_ref_sink(render));
|
|
exo_icon_view_set_search_column((ExoIconView*)fv->view, FM_FOLDER_MODEL_COL_NAME);
|
|
g_signal_connect(fv->view, "item-activated", G_CALLBACK(on_icon_view_item_activated), fv);
|
|
g_signal_connect(fv->view, "selection-changed", G_CALLBACK(on_sel_changed), fv);
|