Moved OVERWRITE_STRING maro to main.h.

We could use this in other files too.

diff --git a/src/main.h b/src/main.h
index e20f868..d36cb55 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -50,6 +50,8 @@
 #define PRIMARY_CLIPBOARD() gtk_clipboard_get(GDK_SELECTION_PRIMARY)
 #define SECONDARY_CLIPBOARD() gtk_clipboard_get(GDK_NONE)
 
+#define OVERWRITE_STRING(t, s) if (t) {g_free(t); t = NULL;} t = g_strdup(s);
+
 #define IS_ESCAPE_KEY(k, s) ((k == GDK_Escape && s == 0) || (k == GDK_c && s == GDK_CONTROL_MASK))
 #define CLEAN_STATE_WITH_SHIFT(e) ((e)->state & (GDK_MOD1_MASK|GDK_MOD4_MASK|GDK_SHIFT_MASK|GDK_CONTROL_MASK))
 #define CLEAN_STATE(e)            ((e)->state & (GDK_MOD1_MASK|GDK_MOD4_MASK|GDK_CONTROL_MASK))

diff --git a/src/setting.c b/src/setting.c
index 6f156cc..71c88ba 100644 (file)
--- a/src/setting.c
+++ b/src/setting.c
@@ -20,8 +20,6 @@
 #include "setting.h"
 #include "util.h"
 
-#define OVERWRITE_STRING(t, s) {if(t){g_free(t);t=NULL;}t=g_strdup(s);}
-
 static Arg* setting_char_to_arg(const gchar* str, const Type type);
 static void setting_print_value(const Setting* s, void* value);
 static gboolean setting_webkit(const Setting* s, const gboolean get);