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

Reviewed-on: #4

source/CMakeLists.txt

@@ -43,14 +43,12 @@ pthread)
 
 if (VTE291)
 list(APPEND LIBRARIES ${VTE291_LIBRARIES})
-else()
+add_definitions(-DVTE_INCLUDE)
-add_definitions(-DVTE_DISABLE)
 endif()
 
 if (WEBKIT_LIBRARIES_FOUND)
 list(APPEND LIBRARIES ${WEBKIT_LIBRARIES})
-else()
+add_definitions(-DWEBKIT_INCLUDE)
-add_definitions(-DWEBKIT_DISABLE)
 endif()
 
 message(${CMAKE_INSTALL_LIBDIR})

source/libublsettings-gtk3.c

@@ -4,7 +4,7 @@
 
 static render_data render;
 
-#ifndef VTE_DISABLE
+#ifdef VTE_INCLUDE
 
 static void child_ready(VteTerminal *terminal, GPid pid, GError *error, gpointer user_data)
 {
@@ -358,7 +358,7 @@ void yon_terminal_integrated_start(GtkWidget *terminal, char* command, void *end
         }
     }
 
-    void yon_on_window_config_custom_window_destroy(GtkWindow *window, char *window_name){
+    void yon_on_window_config_custom_window_destroy(GtkWindow *window, GdkEvent* event, char *window_name){
         if (!gtk_window_is_maximized(window)){
             int height=0;
             int width=0;
@@ -824,7 +824,7 @@ void yon_ubl_setup_sockets(GtkWidget *main_window, GtkWidget *left_window, GtkWi
     }
 }
 
-#ifndef WEBKIT_DISABLE
+#ifdef WEBKIT_INCLUDE
 
 void yon_ubl_browser_window_open(char *link, char *browser_window_name){
     GtkWidget *browser=gtk_window_new(GTK_WINDOW_TOPLEVEL);

source/libublsettings-gtk3.h

@@ -7,7 +7,7 @@
 
 
 #ifdef __GTK_H__
-#ifndef VTE_DISABLE
+#ifdef VTE_INCLUDE
 #include <vte/vte.h>
 /**
  * void yon_terminal_integrated_launch(GtkWidget *place_to_show, void *endwork_function, void* endwork_function_argument)
@@ -384,7 +384,7 @@ void _yon_ubl_header_setup_resource(GtkWidget *Overlay, GtkWidget *Head, GtkWidg
 */
 void yon_ubl_setup_sockets(GtkWidget *main_window, GtkWidget *left_window, GtkWidget *right_window, int socket_main_id, int socket_left_id, int socket_right_id);
 
-#ifndef WEBKIT_DISABLE
+#ifdef WEBKIT_INCLUDE
 #include <webkit2/webkit2.h> 
 
 /**yon_ubl_browser_window_open(char *link, char *browser_window_name)