From 4542ef2e78dae44704f5a0131497e73c6afe4963 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 20 Nov 2024 10:07:09 +0600 Subject: [PATCH 1/2] Warning fix --- source/libublsettings-gtk3.c | 5 ++--- source/libublsettings-gtk3.h | 3 --- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/source/libublsettings-gtk3.c b/source/libublsettings-gtk3.c index 9c8ff61..cc6267e 100644 --- a/source/libublsettings-gtk3.c +++ b/source/libublsettings-gtk3.c @@ -1,6 +1,4 @@ -#define VTE_INCLUDE #include "libublsettings-gtk3.h" -#undef VTE_INCLUDE #ifdef __GTK_H__ @@ -1370,7 +1368,8 @@ gboolean yon_gtk_list_store_copy_full(GtkListStore *target, GtkListStore *source int columns = gtk_tree_model_get_n_columns(GTK_TREE_MODEL(source)); int target_columns = gtk_tree_model_get_n_columns(GTK_TREE_MODEL(target)); if (columns!=target_columns){ - g_warning("Target and source models have different number of columns",NULL); + // g_warning("Target and source models have different number of columns",NULL); + g_log((gchar*)0,G_LOG_LEVEL_WARNING,"%s\n","Target and source models have different number of columns"); return 0; } for_iter(source,&iter){ diff --git a/source/libublsettings-gtk3.h b/source/libublsettings-gtk3.h index 7c1f9c9..a01f7d3 100644 --- a/source/libublsettings-gtk3.h +++ b/source/libublsettings-gtk3.h @@ -8,7 +8,6 @@ #define _(String) gettext(String) #ifdef __GTK_H__ -#ifdef VTE_INCLUDE #include /** * void yon_terminal_integrated_launch(GtkWidget *place_to_show, void *endwork_function, void* endwork_function_argument) @@ -45,8 +44,6 @@ void yon_terminal_integrated_start_shell(GtkWidget *terminal, char* command, voi void yon_terminal_window_launch(GtkWindow *parent_window, char *command); -#endif - #define for_iter(model,iter) for(int valid = gtk_tree_model_get_iter_first(GTK_TREE_MODEL(model),iter);valid;valid = gtk_tree_model_iter_next(GTK_TREE_MODEL(model),iter)) /**yon_gtk_widget_set_scroll_window_for_scroll(GtkWidget *target, GtkScrollbar *scroll) -- 2.35.1 From e4df763342f58fd6bb0e28b800acd0d61b1b5745 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 20 Nov 2024 14:38:25 +0600 Subject: [PATCH 2/2] Comment removal --- source/libublsettings-gtk3.c | 1 - 1 file changed, 1 deletion(-) diff --git a/source/libublsettings-gtk3.c b/source/libublsettings-gtk3.c index cc6267e..d5e424f 100644 --- a/source/libublsettings-gtk3.c +++ b/source/libublsettings-gtk3.c @@ -1368,7 +1368,6 @@ gboolean yon_gtk_list_store_copy_full(GtkListStore *target, GtkListStore *source int columns = gtk_tree_model_get_n_columns(GTK_TREE_MODEL(source)); int target_columns = gtk_tree_model_get_n_columns(GTK_TREE_MODEL(target)); if (columns!=target_columns){ - // g_warning("Target and source models have different number of columns",NULL); g_log((gchar*)0,G_LOG_LEVEL_WARNING,"%s\n","Target and source models have different number of columns"); return 0; } -- 2.35.1