Documentation: Use G_SOURCE_CONTINUE and G_SOURCE_REMOVE

[geeqie.git] / src / search-and-run.cc

diff --git a/src/search-and-run.cc b/src/search-and-run.cc
index 52a6b8b..af5a7a3 100644 (file)
--- a/src/search-and-run.cc
+++ b/src/search-and-run.cc
@@ -18,12 +18,9 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <gdk/gdkkeysyms.h>
-
 #include "main.h"
 #include "search-and-run.h"
 
-#include "layout-util.h"
 #include "ui-misc.h"
 #include "window.h"
 
@@ -177,17 +174,17 @@ static void command_store_populate(SarData* sar)
 
 static gboolean search_and_run_destroy(gpointer data)
 {
-       SarData *sar = data;
+       SarData *sar = static_cast<SarData *>(data);
 
        sar->lw->sar_window = NULL;
        gtk_widget_destroy(sar->window);
 
-       return TRUE;
+       return G_SOURCE_CONTINUE;
 }
 
 static gboolean entry_box_activate_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       SarData *sar = data;
+       SarData *sar = static_cast<SarData *>(data);
 
        if (sar->action)
                {
@@ -201,7 +198,7 @@ static gboolean entry_box_activate_cb(GtkWidget *UNUSED(widget), gpointer data)
 
 static gboolean keypress_cb(GtkWidget *UNUSED(widget), GdkEventKey *event, gpointer data)
 {
-       SarData *sar = data;
+       SarData *sar = static_cast<SarData *>(data);
        gboolean ret = FALSE;
 
        switch (event->keyval)
@@ -222,7 +219,7 @@ static gboolean keypress_cb(GtkWidget *UNUSED(widget), GdkEventKey *event, gpoin
 
 static gboolean match_selected_cb(GtkEntryCompletion *UNUSED(widget), GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
 {
-       SarData *sar = data;
+       SarData *sar = static_cast<SarData *>(data);
 
        gtk_tree_model_get(GTK_TREE_MODEL(model), iter, SAR_ACTION, &sar->action, -1);
 
@@ -238,7 +235,7 @@ static gboolean match_selected_cb(GtkEntryCompletion *UNUSED(widget), GtkTreeMod
 
 static gboolean match_func(GtkEntryCompletion *completion, const gchar *key, GtkTreeIter *iter, gpointer data)
 {
-       SarData *sar = data;
+       SarData *sar = static_cast<SarData *>(data);
        gboolean ret = FALSE;
        gchar *normalized;
        GtkTreeModel *model;
@@ -257,16 +254,16 @@ static gboolean match_func(GtkEntryCompletion *completion, const gchar *key, Gtk
        reg_exp_str = g_string_new("\\b(\?=.*:)");
        reg_exp_str = g_string_append(reg_exp_str, key);
 
-       reg_exp = g_regex_new(reg_exp_str->str, G_REGEX_CASELESS, 0, &error);
+       reg_exp = g_regex_new(reg_exp_str->str, G_REGEX_CASELESS, GRegexMatchFlags(0), &error);
        if (error)
                {
                log_printf("Error: could not compile regular expression %s\n%s\n", reg_exp_str->str, error->message);
                g_error_free(error);
                error = NULL;
-               reg_exp = g_regex_new("", 0, 0, NULL);
+               reg_exp = g_regex_new("", GRegexCompileFlags(0), GRegexMatchFlags(0), NULL);
                }
 
-       ret = g_regex_match(reg_exp, normalized, 0, NULL);
+       ret = g_regex_match(reg_exp, normalized, GRegexMatchFlags(0), NULL);
 
        if (sar->match_found == FALSE && ret == TRUE)
                {
@@ -295,7 +292,7 @@ GtkWidget *search_and_run_new(LayoutWindow *lw)
        geometry.max_width = 1500;
        geometry.min_height = 10;
        geometry.max_height = 10;
-       gtk_window_set_geometry_hints(GTK_WINDOW(sar->window), NULL, &geometry, GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE);
+       gtk_window_set_geometry_hints(GTK_WINDOW(sar->window), NULL, &geometry, static_cast<GdkWindowHints>(GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE));
 
        gtk_window_set_resizable(GTK_WINDOW(sar->window), TRUE);