Merge pull request 'Warning fix' (#29) from YanTheKaller/libublsettings-gtk3:master into master

Reviewed-on: #29

source/libublsettings-gtk3.c

@@ -1,6 +1,4 @@
-#define VTE_INCLUDE
 #include "libublsettings-gtk3.h"
-#undef VTE_INCLUDE
 
 #ifdef __GTK_H__
 
@@ -1370,7 +1368,7 @@ 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;
     }
     for_iter(source,&iter){

source/libublsettings-gtk3.h

@@ -8,7 +8,6 @@
 #define _(String) gettext(String)
 
 #ifdef __GTK_H__
-#ifdef VTE_INCLUDE
 #include <vte/vte.h>
 /**
  * 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)