Update upstream source from tag 'upstream/1.4.4+git20190129'

Update to upstream version '1.4.4+git20190129'
with Debian dir 54054a0614765eb54d42926212607903bd0cd397

8 files changed, 113 insertions, 99 deletions

diff --git a/configure.ac b/configure.ac
index 07ebf87..29c4a2d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -63,10 +63,10 @@ AC_ARG_WITH([gtk3], AS_HELP_STRING([--with-gtk3], [Build with the GTK+ 3 interfa
 
 if test "x$with_gtk3" = "xyes"; then
   PKG_CHECK_MODULES([GTK], [gtk+-3.0])
-  APPINDICATOR_MODULE="appindicator3-0.1"
+  APPINDICATOR_MODULE="ayatana-appindicator3-0.1"
 else
   PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.10])
-  APPINDICATOR_MODULE="appindicator-0.1"
+  APPINDICATOR_MODULE="ayatana-appindicator-0.1"
 fi
 
 # -------------------------------------------------------------------------------
diff --git a/src/daemon.c b/src/daemon.c
index df3562c..1407321 100644
--- a/src/daemon.c
+++ b/src/daemon.c
@@ -24,7 +24,6 @@
 #include "daemon.h"
 
 
-static gint timeout_id;
 static gchar *primary_text;
 static gchar *clipboard_text;
 static GtkClipboard *primary;
@@ -53,7 +52,17 @@ static void daemon_check()
 	{
 		/* Get the button state to check if the mouse button is being held */
 		GdkModifierType button_state;
-		gdk_window_get_pointer(NULL, NULL, NULL, &button_state);
+		GdkScreen *screen = gdk_screen_get_default();
+		if (screen)
+		{
+			GdkDisplay *display = gdk_screen_get_display(screen);
+			GdkWindow *window = gdk_screen_get_root_window(screen);
+			GdkSeat *seat = gdk_display_get_default_seat(display);
+
+			gdk_window_get_device_position(window, gdk_seat_get_pointer(seat), NULL,
+				NULL, &button_state);
+		}
+
 		if ((primary_temp != NULL) && !(button_state & GDK_BUTTON1_MASK))
 		{
 			g_free(primary_text);
@@ -82,19 +91,6 @@ static void daemon_check()
 	g_free(clipboard_temp);
 }
 
-/* Called if timeout was destroyed */
-static void reset_daemon(gpointer data)
-{
-	if (timeout_id != 0)
-		g_source_remove(timeout_id);
-	/* Add the daemon loop */
-	timeout_id = g_timeout_add_full(G_PRIORITY_LOW,
-					DAEMON_INTERVAL,
-					(GSourceFunc)daemon_check,
-					NULL,
-					(GDestroyNotify)reset_daemon);
-}
-
 /* Initializes daemon mode */
 void init_daemon_mode()
 {
@@ -102,11 +98,9 @@ void init_daemon_mode()
 	primary = gtk_clipboard_get(GDK_SELECTION_PRIMARY);
 	clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
 	/* Add the daemon loop */
-	timeout_id = g_timeout_add_full(G_PRIORITY_LOW,
-					DAEMON_INTERVAL,
-					(GSourceFunc)daemon_check,
-					NULL,
-					(GDestroyNotify)reset_daemon);
+	/* Register for clipboard change events */
+	g_signal_connect(primary, "owner-change", G_CALLBACK(daemon_check), NULL);
+	g_signal_connect(clipboard, "owner-change", G_CALLBACK(daemon_check), NULL);
 
 	/* Start daemon loop */
 	gtk_main();
diff --git a/src/daemon.h b/src/daemon.h
index a3e3352..e20f498 100644
--- a/src/daemon.h
+++ b/src/daemon.h
@@ -24,8 +24,6 @@
 
 G_BEGIN_DECLS
 
-#define DAEMON_INTERVAL 500
-
 void init_daemon_mode();
 
 G_END_DECLS
diff --git a/src/main.c b/src/main.c
index 7e485ec..3b8939a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -24,12 +24,14 @@
 #include <config.h>
 #endif
 
+#define _GNU_SOURCE
+
 #include <glib.h>
 #include <stdlib.h>
 #include <gtk/gtk.h>
 #include <X11/keysym.h>
 #ifdef HAVE_APPINDICATOR
-#include <libappindicator/app-indicator.h>
+#include <libayatana-appindicator/app-indicator.h>
 #endif
 #include "main.h"
 #include "utils.h"
@@ -60,14 +62,32 @@ static gboolean status_menu_lock = FALSE;
 static gboolean actions_lock = FALSE;
 
 /* Init preferences structure */
-prefs_t prefs = {DEF_USE_COPY,         DEF_USE_PRIMARY,      DEF_SYNCHRONIZE,
-                 DEF_AUTOMATIC_PASTE,  DEF_SHOW_INDEXES,     DEF_SAVE_URIS,
-                 DEF_USE_RMB_MENU,     DEF_SAVE_HISTORY,     DEF_HISTORY_LIMIT,
-                 DEF_ITEMS_MENU,       DEF_STATICS_SHOW,     DEF_STATICS_ITEMS,
-                 DEF_HYPERLINKS_ONLY,  DEF_CONFIRM_CLEAR,    DEF_SINGLE_LINE,
-                 DEF_REVERSE_HISTORY,  DEF_ITEM_LENGTH,      DEF_ELLIPSIZE,
-                 INIT_HISTORY_KEY,     INIT_ACTIONS_KEY,     INIT_MENU_KEY,
-                 INIT_SEARCH_KEY,      INIT_OFFLINE_KEY,     DEF_NO_ICON,
+prefs_t prefs = {DEF_USE_COPY,
+                 DEF_USE_PRIMARY,
+                 DEF_SYNCHRONIZE,
+                 DEF_AUTOMATIC_PASTE,
+                 DEF_SHOW_INDEXES,
+                 DEF_SAVE_URIS,
+                 DEF_USE_RMB_MENU,
+                 DEF_SAVE_HISTORY,
+                 DEF_HISTORY_LIMIT,
+                 DEF_HISTORY_TIMEOUT,
+                 DEF_HISTORY_TIMEOUT_SECONDS,
+                 DEF_ITEMS_MENU,
+                 DEF_STATICS_SHOW,
+                 DEF_STATICS_ITEMS,
+                 DEF_HYPERLINKS_ONLY,
+                 DEF_CONFIRM_CLEAR,
+                 DEF_SINGLE_LINE,
+                 DEF_REVERSE_HISTORY,
+                 DEF_ITEM_LENGTH,
+                 DEF_ELLIPSIZE,
+                 INIT_HISTORY_KEY,
+                 INIT_ACTIONS_KEY,
+                 INIT_MENU_KEY,
+                 INIT_SEARCH_KEY,
+                 INIT_OFFLINE_KEY,
+                 DEF_NO_ICON,
                  DEF_OFFLINE_MODE};
 
 /* Variables for input buffer used for matching input to menu items */
@@ -125,7 +145,17 @@ static gboolean item_check(gpointer data) {
   else
   {
     GdkModifierType button_state;
-    gdk_window_get_pointer(NULL, NULL, NULL, &button_state);
+    GdkScreen *screen = gdk_screen_get_default();
+    if (screen)
+    {
+      GdkDisplay *display = gdk_screen_get_display(screen);
+      GdkWindow *window = gdk_screen_get_root_window(screen);
+      GdkSeat *seat = gdk_display_get_default_seat(display);
+
+      gdk_window_get_device_position(window, gdk_seat_get_pointer(seat), NULL,
+          NULL, &button_state);
+    }
+
     /* Proceed if mouse button not being held */
     if ((primary_temp != NULL) && !(button_state & GDK_BUTTON1_MASK))
     {
@@ -295,7 +325,7 @@ static void show_about_dialog(GtkMenuItem *menu_item, gpointer user_data) {
     /* Create the about dialog */
     GtkWidget* about_dialog = gtk_about_dialog_new();
     gtk_window_set_icon((GtkWindow*)about_dialog,
-                        gtk_widget_render_icon(about_dialog, GTK_STOCK_ABOUT, GTK_ICON_SIZE_MENU, NULL));
+                        gtk_widget_render_icon_pixbuf(about_dialog, GTK_STOCK_ABOUT, GTK_ICON_SIZE_MENU));
 
     gtk_about_dialog_set_program_name((GtkAboutDialog*)about_dialog, "ClipIt");
     #ifdef HAVE_CONFIG_H
@@ -541,7 +571,7 @@ gboolean selected_by_input(const GtkWidget *history_menu, const GdkEventKey *eve
     return FALSE;
   }
 
-  if (event->keyval == GDK_Down || event->keyval == GDK_Up) {
+  if (event->keyval == GDK_KEY_Down || event->keyval == GDK_KEY_Up) {
     return FALSE;
   }
 
@@ -549,11 +579,11 @@ gboolean selected_by_input(const GtkWidget *history_menu, const GdkEventKey *eve
     append_to_input_buffer(event->string);
 
   GtkMenuShell* menu = (GtkMenuShell *) history_menu;
-  GList* element = menu->children;
+  GList* element = gtk_container_get_children(menu);
   GtkMenuItem *menu_item, *first_match = 0;
 
   const gchar* menu_label;
-  int count, match_count = 0;
+  int count = 0, match_count = 0;
   char* match;
 
   while (element->next != NULL && count < prefs.items_menu) {
@@ -578,69 +608,62 @@ gboolean selected_by_input(const GtkWidget *history_menu, const GdkEventKey *eve
 
   if (first_match && match_count != prefs.items_menu) {
     gtk_menu_item_select(first_match);
-    menu->active_menu_item = (GtkWidget *) first_match;
+	gtk_menu_shell_select_item(menu, first_match);
     return TRUE;
   }
   return FALSE;
 }
 
 gboolean selected_by_digit(const GtkWidget *history_menu, const GdkEventKey *event) {
+  int selection = -1;
   switch (event->keyval) {
     case XK_1:
     case XK_KP_1:
-      item_selected((GtkMenuItem*)history_menu, GINT_TO_POINTER(0));
-      gtk_widget_destroy(history_menu);
+	  selection = 1;
       break;
     case XK_2:
     case XK_KP_2:
-      item_selected((GtkMenuItem*)history_menu, GINT_TO_POINTER(1));
-      gtk_widget_destroy(history_menu);
+	  selection = 2;
       break;
     case XK_3:
     case XK_KP_3:
-      item_selected((GtkMenuItem*)history_menu, GINT_TO_POINTER(2));
-      gtk_widget_destroy(history_menu);
+	  selection = 3;
       break;
     case XK_4:
     case XK_KP_4:
-      item_selected((GtkMenuItem*)history_menu, GINT_TO_POINTER(3));
-      gtk_widget_destroy(history_menu);
+	  selection = 4;
       break;
     case XK_5:
     case XK_KP_5:
-      item_selected((GtkMenuItem*)history_menu, GINT_TO_POINTER(4));
-      gtk_widget_destroy(history_menu);
+	  selection = 5;
       break;
     case XK_6:
     case XK_KP_6:
-      item_selected((GtkMenuItem*)history_menu, GINT_TO_POINTER(5));
-      gtk_widget_destroy(history_menu);
+	  selection = 6;
       break;
     case XK_7:
     case XK_KP_7:
-      item_selected((GtkMenuItem*)history_menu, GINT_TO_POINTER(6));
-      gtk_widget_destroy(history_menu);
+	  selection = 7;
       break;
     case XK_8:
     case XK_KP_8:
-      item_selected((GtkMenuItem*)history_menu, GINT_TO_POINTER(7));
-      gtk_widget_destroy(history_menu);
+	  selection = 8;
       break;
     case XK_9:
     case XK_KP_9:
-      item_selected((GtkMenuItem*)history_menu, GINT_TO_POINTER(8));
-      gtk_widget_destroy(history_menu);
+	  selection = 9;
       break;
     case XK_0:
     case XK_KP_0:
-      item_selected((GtkMenuItem*)history_menu, GINT_TO_POINTER(9));
-      gtk_widget_destroy(history_menu);
+	  selection = 0;
       break;
-
-    default:
-      return FALSE;
   }
-  return TRUE;
+  if (selection >= 0) {
+	item_selected((GtkMenuItem*)history_menu, GINT_TO_POINTER(selection));
+	gtk_widget_destroy(history_menu);
+	return TRUE;
+  }
+  return FALSE;
 }
 
 static void toggle_offline_mode() {
@@ -727,7 +750,7 @@ static GtkWidget *create_history_menu(GtkWidget *history_menu) {
 				element_number--;
 			else
 				element_number++;
-				element_number_small++;
+			element_number_small++;
 		}
 		/* Cleanup */
 		g_free(primary_temp);
@@ -954,7 +977,8 @@ static void clipit_init() {
 	/* Create clipboard */
 	primary = gtk_clipboard_get(GDK_SELECTION_PRIMARY);
 	clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
-	g_timeout_add(CHECK_INTERVAL, item_check, NULL);
+	g_signal_connect(primary, "owner-change", G_CALLBACK(item_check), NULL);
+	g_signal_connect(clipboard, "owner-change", G_CALLBACK(item_check), NULL);
 
 	/* Read preferences */
 	read_preferences();
@@ -1034,7 +1058,6 @@ int main(int argc, char **argv) {
 				return 0;
 			}
 			g_string_free(piped_string, TRUE);
-			return -1;
 		}
 	}
 
diff --git a/src/main.h b/src/main.h
index e0c73e1..de41d91 100644
--- a/src/main.h
+++ b/src/main.h
@@ -29,7 +29,6 @@ G_BEGIN_DECLS
 
 #define ACTIONS_TAB    2
 #define POPUP_DELAY    30
-#define CHECK_INTERVAL 500
 
 #if GTK_MAJOR_VERSION == 3
 #define GTK_DIALOG_NO_SEPARATOR 0
diff --git a/src/manage.c b/src/manage.c
index ffdb4b9..8da8597 100644
--- a/src/manage.c
+++ b/src/manage.c
@@ -141,7 +141,7 @@ static void edit_selected()
                                                     GTK_STOCK_OK,           GTK_RESPONSE_ACCEPT, NULL);
 
     gtk_window_set_default_size((GtkWindow*)dialog, 450, 300);
-    gtk_window_set_icon((GtkWindow*)dialog, gtk_widget_render_icon(dialog, GTK_STOCK_EDIT, GTK_ICON_SIZE_MENU, NULL));
+    gtk_window_set_icon((GtkWindow*)dialog, gtk_widget_render_icon_pixbuf(dialog, GTK_STOCK_EDIT, GTK_ICON_SIZE_MENU));
 
     /* Build the scrolled window with the text view */
     GtkWidget* scrolled_window = gtk_scrolled_window_new((GtkAdjustment*) gtk_adjustment_new(0, 0, 0, 0, 0, 0),
@@ -349,7 +349,7 @@ gboolean show_search()
   /* Create the dialog */
   GtkWidget* search_dialog = gtk_dialog_new();
 
-  gtk_window_set_icon((GtkWindow*)search_dialog, gtk_widget_render_icon(search_dialog, GTK_STOCK_FIND, GTK_ICON_SIZE_MENU, NULL));
+  gtk_window_set_icon((GtkWindow*)search_dialog, gtk_widget_render_icon_pixbuf(search_dialog, GTK_STOCK_FIND, GTK_ICON_SIZE_MENU));
   gchar *orig_title = _("Manage History");
   gchar *title = 0;
   if (prefs.offline_mode)
@@ -367,11 +367,11 @@ gboolean show_search()
   if (win_height > screen_height)
     win_height = screen_height;
 
-  GtkWidget* vbox_search = gtk_vbox_new(FALSE, 10);
+  GtkWidget* vbox_search = gtk_box_new(GTK_ORIENTATION_VERTICAL, 10);
   gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area (GTK_DIALOG(search_dialog))), vbox_search, TRUE, TRUE, 2);
   gtk_widget_set_size_request((GtkWidget*)vbox_search, 400, win_height);
 
-  hbox = gtk_hbox_new(TRUE, 4);
+  hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
   gtk_box_pack_start((GtkBox*)vbox_search, hbox, FALSE, FALSE, 0);
   search_entry = gtk_entry_new();
   gtk_box_pack_end((GtkBox*)hbox, search_entry, TRUE, TRUE, 0);
diff --git a/src/preferences.c b/src/preferences.c
index 2736f7a..8136225 100644
--- a/src/preferences.c
+++ b/src/preferences.c
@@ -728,7 +728,7 @@ void show_preferences(gint tab) {
                                                     GTK_STOCK_CANCEL,   GTK_RESPONSE_REJECT,
                                                     GTK_STOCK_OK,       GTK_RESPONSE_ACCEPT, NULL);
 
-  gtk_window_set_icon((GtkWindow*)dialog, gtk_widget_render_icon(dialog, GTK_STOCK_PREFERENCES, GTK_ICON_SIZE_MENU, NULL));
+  gtk_window_set_icon((GtkWindow*)dialog, gtk_widget_render_icon_pixbuf(dialog, GTK_STOCK_PREFERENCES, GTK_ICON_SIZE_MENU));
   gtk_window_set_resizable((GtkWindow*)dialog, FALSE);
 
   /* Create notebook */
@@ -743,7 +743,7 @@ void show_preferences(gint tab) {
   GtkWidget* page_settings = gtk_alignment_new(0.50, 0.50, 1.0, 1.0);
   gtk_alignment_set_padding((GtkAlignment*)page_settings, 12, 6, 12, 6);
   gtk_notebook_append_page((GtkNotebook*)notebook, page_settings, gtk_label_new(_("Settings")));
-  GtkWidget* vbox_settings = gtk_vbox_new(FALSE, 12);
+  GtkWidget* vbox_settings = gtk_box_new(GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_add((GtkContainer*)page_settings, vbox_settings);
 
   /* Build the clipboards frame */
@@ -755,7 +755,7 @@ void show_preferences(gint tab) {
   alignment = gtk_alignment_new(0.50, 0.50, 1.0, 1.0);
   gtk_alignment_set_padding((GtkAlignment*)alignment, 12, 0, 12, 0);
   gtk_container_add((GtkContainer*)frame, alignment);
-  vbox = gtk_vbox_new(FALSE, 2);
+  vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 2);
   gtk_container_add((GtkContainer*)alignment, vbox);
   copy_check = gtk_check_button_new_with_mnemonic(_("Use _Copy (Ctrl-C)"));
   g_signal_connect((GObject*)copy_check, "toggled", (GCallback)check_toggled, NULL);
@@ -779,7 +779,7 @@ void show_preferences(gint tab) {
   alignment = gtk_alignment_new(0.50, 0.50, 1.0, 1.0);
   gtk_alignment_set_padding((GtkAlignment*)alignment, 12, 0, 12, 0);
   gtk_container_add((GtkContainer*)frame, alignment);
-  vbox = gtk_vbox_new(FALSE, 2);
+  vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 2);
   gtk_container_add((GtkContainer*)alignment, vbox);
   show_indexes_check = gtk_check_button_new_with_mnemonic(_("Show _indexes in history menu"));
   gtk_box_pack_start((GtkBox*)vbox, show_indexes_check, FALSE, FALSE, 0);
@@ -791,7 +791,7 @@ void show_preferences(gint tab) {
   gtk_box_pack_start((GtkBox*)vbox, confirm_check, FALSE, FALSE, 0);
   use_rmb_menu_check = gtk_check_button_new_with_mnemonic(_("_Use right-click menu"));
   gtk_box_pack_start((GtkBox*)vbox, use_rmb_menu_check, FALSE, FALSE, 0);
-  hbox = gtk_hbox_new(FALSE, 4);
+  hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
   gtk_box_pack_start((GtkBox*)vbox, hbox, FALSE, FALSE, 0);
   gtk_box_pack_start((GtkBox*)vbox_settings, frame, FALSE, FALSE, 0);
 
@@ -799,7 +799,7 @@ void show_preferences(gint tab) {
   GtkWidget* page_history = gtk_alignment_new(0.50, 0.50, 1.0, 1.0);
   gtk_alignment_set_padding((GtkAlignment*)page_history, 12, 6, 12, 6);
   gtk_notebook_append_page((GtkNotebook*)notebook, page_history, gtk_label_new(_("History")));
-  GtkWidget* vbox_history = gtk_vbox_new(FALSE, 12);
+  GtkWidget* vbox_history = gtk_box_new(GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_add((GtkContainer*)page_history, vbox_history);
 
   /* Build the history frame */
@@ -811,12 +811,12 @@ void show_preferences(gint tab) {
   alignment = gtk_alignment_new(0.50, 0.50, 1.0, 1.0);
   gtk_alignment_set_padding((GtkAlignment*)alignment, 12, 0, 12, 0);
   gtk_container_add((GtkContainer*)frame, alignment);
-  vbox = gtk_vbox_new(FALSE, 2);
+  vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 2);
   gtk_container_add((GtkContainer*)alignment, vbox);
   save_check = gtk_check_button_new_with_mnemonic(_("Save _history"));
   gtk_widget_set_tooltip_text(save_check, _("Save and restore history between sessions"));
   gtk_box_pack_start((GtkBox*)vbox, save_check, FALSE, FALSE, 0);
-  hbox = gtk_hbox_new(FALSE, 4);
+  hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
   gtk_box_pack_start((GtkBox*)vbox, hbox, FALSE, FALSE, 0);
   label = gtk_label_new(_("Items in history:"));
   gtk_misc_set_alignment((GtkMisc*)label, 0.0, 0.50);
@@ -825,7 +825,7 @@ void show_preferences(gint tab) {
   history_spin = gtk_spin_button_new((GtkAdjustment*)adjustment, 0.0, 0);
   gtk_spin_button_set_update_policy((GtkSpinButton*)history_spin, GTK_UPDATE_IF_VALID);
   gtk_box_pack_start((GtkBox*)hbox, history_spin, FALSE, FALSE, 0);
-  hbox = gtk_hbox_new(FALSE, 4);
+  hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
   gtk_box_pack_start((GtkBox*)vbox, hbox, FALSE, FALSE, 0);
   label = gtk_label_new(_("Items in menu:"));
   gtk_misc_set_alignment((GtkMisc*)label, 0.0, 0.50);
@@ -837,7 +837,7 @@ void show_preferences(gint tab) {
   statics_show_check = gtk_check_button_new_with_mnemonic(_("Show _static items in menu"));
   g_signal_connect((GObject*)statics_show_check, "toggled", (GCallback)check_toggled, NULL);
   gtk_box_pack_start((GtkBox*)vbox, statics_show_check, FALSE, FALSE, 0);
-  hbox = gtk_hbox_new(FALSE, 4);
+  hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
   gtk_box_pack_start((GtkBox*)vbox, hbox, FALSE, FALSE, 0);
   label = gtk_label_new(_("Static items in menu:"));
   gtk_misc_set_alignment((GtkMisc*)label, 0.0, 0.50);
@@ -851,7 +851,7 @@ void show_preferences(gint tab) {
   g_signal_connect((GObject*)history_timeout_check, "toggled", (GCallback)check_toggled, NULL);
   g_signal_connect((GObject*)history_timeout_check, "toggled", (GCallback)handle_history_purge_toggle, NULL);
   gtk_box_pack_start((GtkBox*)vbox, history_timeout_check, FALSE, FALSE, 0);
-  hbox = gtk_hbox_new(FALSE, 4);
+  hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
   gtk_box_pack_start((GtkBox*)vbox, hbox, FALSE, FALSE, 0);
   label = gtk_label_new(_("Timeout seconds"));
   gtk_misc_set_alignment((GtkMisc*)label, 0.0, 0.50);
@@ -873,13 +873,13 @@ void show_preferences(gint tab) {
   alignment = gtk_alignment_new(0.50, 0.50, 1.0, 1.0);
   gtk_alignment_set_padding((GtkAlignment*)alignment, 12, 0, 12, 0);
   gtk_container_add((GtkContainer*)frame, alignment);
-  vbox = gtk_vbox_new(FALSE, 2);
+  vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 2);
   gtk_container_add((GtkContainer*)alignment, vbox);
   linemode_check = gtk_check_button_new_with_mnemonic(_("Show in a single _line"));
   gtk_box_pack_start((GtkBox*)vbox, linemode_check, FALSE, FALSE, 0);
   reverse_check = gtk_check_button_new_with_mnemonic(_("Show in _reverse order"));
   gtk_box_pack_start((GtkBox*)vbox, reverse_check, FALSE, FALSE, 0);
-  hbox = gtk_hbox_new(FALSE, 4);
+  hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
   gtk_box_pack_start((GtkBox*)vbox, hbox, FALSE, FALSE, 0);
   label = gtk_label_new(_("Character length of items:"));
   gtk_misc_set_alignment((GtkMisc*)label, 0.0, 0.50);
@@ -888,7 +888,7 @@ void show_preferences(gint tab) {
   charlength_spin = gtk_spin_button_new((GtkAdjustment*)adjustment, 0.0, 0);
   gtk_spin_button_set_update_policy((GtkSpinButton*)charlength_spin, GTK_UPDATE_IF_VALID);
   gtk_box_pack_start((GtkBox*)hbox, charlength_spin, FALSE, FALSE, 0);
-  hbox = gtk_hbox_new(FALSE, 4);
+  hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
   gtk_box_pack_start((GtkBox*)vbox, hbox, FALSE, FALSE, 0);
   label = gtk_label_new(_("Omit items in the:"));
   gtk_misc_set_alignment((GtkMisc*)label, 0.0, 0.50);
@@ -909,9 +909,9 @@ void show_preferences(gint tab) {
   alignment = gtk_alignment_new(0.50, 0.50, 1.0, 1.0);
   gtk_alignment_set_padding((GtkAlignment*)alignment, 12, 0, 12, 0);
   gtk_container_add((GtkContainer*)frame, alignment);
-  vbox = gtk_vbox_new(FALSE, 2);
+  vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 2);
   gtk_container_add((GtkContainer*)alignment, vbox);
-  hbox = gtk_hbox_new(FALSE, 4);
+  hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
   gtk_box_pack_start((GtkBox*)vbox, hbox, FALSE, FALSE, 0);
   label = gtk_label_new(_("Omit items in the:"));
   gtk_misc_set_alignment((GtkMisc*)label, 0.0, 0.50);
@@ -927,7 +927,7 @@ void show_preferences(gint tab) {
   GtkWidget* page_actions = gtk_alignment_new(0.50, 0.50, 1.0, 1.0);
   gtk_alignment_set_padding((GtkAlignment*)page_actions, 6, 6, 6, 6);
   gtk_notebook_append_page((GtkNotebook*)notebook, page_actions, gtk_label_new(_("Actions")));
-  GtkWidget* vbox_actions = gtk_vbox_new(FALSE, 6);
+  GtkWidget* vbox_actions = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
   gtk_container_add((GtkContainer*)page_actions, vbox_actions);
 
   /* Build the actions label */
@@ -995,7 +995,7 @@ void show_preferences(gint tab) {
   GtkWidget* page_exclude = gtk_alignment_new(0.50, 0.50, 1.0, 1.0);
   gtk_alignment_set_padding((GtkAlignment*)page_exclude, 6, 6, 6, 6);
   gtk_notebook_append_page((GtkNotebook*)notebook, page_exclude, gtk_label_new(_("Exclude")));
-  GtkWidget* vbox_exclude = gtk_vbox_new(FALSE, 6);
+  GtkWidget* vbox_exclude = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
   gtk_container_add((GtkContainer*)page_exclude, vbox_exclude);
 
   /* Build the exclude label */
@@ -1048,7 +1048,7 @@ void show_preferences(gint tab) {
   GtkWidget* page_extras = gtk_alignment_new(0.50, 0.50, 1.0, 1.0);
   gtk_alignment_set_padding((GtkAlignment*)page_extras, 12, 6, 12, 6);
   gtk_notebook_append_page((GtkNotebook*)notebook, page_extras, gtk_label_new(_("Hotkeys")));
-  GtkWidget* vbox_extras = gtk_vbox_new(FALSE, 12);
+  GtkWidget* vbox_extras = gtk_box_new(GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_add((GtkContainer*)page_extras, vbox_extras);
 
   /* Build the hotkeys frame */
@@ -1060,10 +1060,10 @@ void show_preferences(gint tab) {
   alignment = gtk_alignment_new(0.50, 0.50, 1.0, 1.0);
   gtk_alignment_set_padding((GtkAlignment*)alignment, 12, 0, 12, 0);
   gtk_container_add((GtkContainer*)frame, alignment);
-  vbox = gtk_vbox_new(FALSE, 2);
+  vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 2);
   gtk_container_add((GtkContainer*)alignment, vbox);
   /* History key combination */
-  hbox = gtk_hbox_new(TRUE, 4);
+  hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
   gtk_box_pack_start((GtkBox*)vbox, hbox, FALSE, FALSE, 0);
   label = gtk_label_new(_("History hotkey:"));
   gtk_misc_set_alignment((GtkMisc*)label, 0.0, 0.50);
@@ -1072,7 +1072,7 @@ void show_preferences(gint tab) {
   gtk_entry_set_width_chars((GtkEntry*)history_key_entry, 10);
   gtk_box_pack_end((GtkBox*)hbox, history_key_entry, TRUE, TRUE, 0);
   /* Actions key combination */
-  hbox = gtk_hbox_new(TRUE, 4);
+  hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
   gtk_box_pack_start((GtkBox*)vbox, hbox, FALSE, FALSE, 0);
   label = gtk_label_new(_("Actions hotkey:"));
   gtk_misc_set_alignment((GtkMisc*)label, 0.0, 0.50);
@@ -1081,7 +1081,7 @@ void show_preferences(gint tab) {
   gtk_entry_set_width_chars((GtkEntry*)actions_key_entry, 10);
   gtk_box_pack_end((GtkBox*)hbox, actions_key_entry, TRUE, TRUE, 0);
   /* Menu key combination */
-  hbox = gtk_hbox_new(TRUE, 4);
+  hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
   gtk_box_pack_start((GtkBox*)vbox, hbox, FALSE, FALSE, 0);
   label = gtk_label_new(_("Menu hotkey:"));
   gtk_misc_set_alignment((GtkMisc*)label, 0.0, 0.50);
@@ -1090,7 +1090,7 @@ void show_preferences(gint tab) {
   gtk_entry_set_width_chars((GtkEntry*)menu_key_entry, 10);
   gtk_box_pack_end((GtkBox*)hbox, menu_key_entry, TRUE, TRUE, 0);
   /* Search key combination */
-  hbox = gtk_hbox_new(TRUE, 4);
+  hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
   gtk_box_pack_start((GtkBox*)vbox, hbox, FALSE, FALSE, 0);
   label = gtk_label_new(_("Manage hotkey:"));
   gtk_misc_set_alignment((GtkMisc*)label, 0.0, 0.50);
@@ -1099,7 +1099,7 @@ void show_preferences(gint tab) {
   gtk_entry_set_width_chars((GtkEntry*)search_key_entry, 10);
   gtk_box_pack_end((GtkBox*)hbox, search_key_entry, TRUE, TRUE, 0);
   /* Offline mode key combination */
-  hbox = gtk_hbox_new(TRUE, 4);
+  hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
   gtk_box_pack_start((GtkBox*)vbox, hbox, FALSE, FALSE, 0);
   label = gtk_label_new(_("Offline mode hotkey:"));
   gtk_misc_set_alignment((GtkMisc*)label, 0.0, 0.50);
diff --git a/src/utils.c b/src/utils.c
index 5e7776c..4439f32 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -118,7 +118,7 @@ GString *remove_newlines_string(GString *string)
 gboolean parse_options(int argc, char* argv[])
 {
 	/* Declare argument options and argument variables */
-	gboolean icon = FALSE, daemon = FALSE,
+	gboolean no_icon = FALSE, daemon = FALSE,
 		clipboard = FALSE, primary = FALSE,
 		exit = FALSE;
 
@@ -135,7 +135,7 @@ gboolean parse_options(int argc, char* argv[])
 			"no-icon", 'n',
 			0,
 			G_OPTION_ARG_NONE,
-			&icon, _("Do not use status icon (Ctrl-Alt-P for menu)"),
+			&no_icon, _("Do not use status icon (Ctrl-Alt-P for menu)"),
 			NULL
 		},
 		{
@@ -177,7 +177,7 @@ gboolean parse_options(int argc, char* argv[])
 	/* Check which options were parseed */
 
 	/* Do not display icon option */
-	if (icon)
+	if (no_icon)
 	{
 		prefs.no_icon = TRUE;
 	}