AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-09-19 13:30:02 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'matthiasc/for-main' into 'main'

Browse Source 
Fix the build with clang

See merge request GNOME/gtk!5876
This commit is contained in:
Matthias Clasen 2023-04-27 04:37:12 +00:00
commit 9ae0a3865c
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gtk/gtkapplication-dbus.c
View File

@ -895,7 +895,8 @@ gtk_application_impl_dbus_finalize (GObject *object)
g_free (dbus->app_menu_path);
g_free (dbus->menubar_path);
g_clear_object (&dbus->sm_proxy);
g_signal_handlers_disconnect_by_func (dbus->ss_proxy, screensaver_signal_session, dbus->impl.application);
if (dbus->ss_proxy)
g_signal_handlers_disconnect_by_func (dbus->ss_proxy, screensaver_signal_session, dbus->impl.application);
g_clear_object (&dbus->ss_proxy);
G_OBJECT_CLASS (gtk_application_impl_dbus_parent_class)->finalize (object);

4
gtk/gtkpathbar.c
View File

@ -418,13 +418,11 @@ set_button_image (GtkPathBar *path_bar,
ButtonData *button_data)
{
struct SetButtonImageData *data;
GIcon *root_icon = NULL;
switch (button_data->type)
{
case ROOT_BUTTON:
GIcon *root_icon = NULL;
if (!button_data->mount && path_bar->root_icon != NULL &&
g_file_is_native (button_data->file))
{