diff options
author | Barrucadu <mike@barrucadu.co.uk> | 2009-05-19 20:06:14 +0100 |
---|---|---|
committer | Barrucadu <mike@barrucadu.co.uk> | 2009-05-19 20:06:14 +0100 |
commit | 2e4dfe9c23165f32c5161dd2c4dbf09c60e10191 (patch) | |
tree | c52a1a69b95fbaf1fce21b4eb91183996eeb5e09 | |
parent | 6ac8a0d07f02dd99a78d3569a6637e5ea44e5cb0 (diff) |
Fix merge conflicts from salinasv which git didn't tell me about...
-rw-r--r-- | uzbl.c | 7 | ||||
-rw-r--r-- | uzbl.h | 4 |
2 files changed, 0 insertions, 11 deletions
@@ -565,7 +565,6 @@ run_js (WebKitWebView * web_view, GArray *argv) { } static void -<<<<<<< HEAD:uzbl.c run_external_js (WebKitWebView * web_view, GArray *argv) { if (argv_idx(argv, 0)) { GArray* lines = read_file_by_line (argv_idx (argv, 0)); @@ -601,12 +600,6 @@ search_text (WebKitWebView *page, GArray *argv, const gboolean forward) { if (argv_idx(argv, 0) && (*argv_idx(argv, 0) != '\0')) uzbl.state.searchtx = g_strdup(argv_idx(argv, 0)); -======= -search_text (WebKitWebView *page, const char *param, const gboolean forward) { - if ((param) && (param[0] != '\0')) { - uzbl.state.searchtx = g_strdup(param); - } ->>>>>>> b520d89... merge in from salinasv:uzbl.c if (uzbl.state.searchtx != NULL) { if (uzbl.state.verbose) printf ("Searching: %s\n", uzbl.state.searchtx); @@ -108,12 +108,8 @@ typedef struct { gchar *selected_url; gchar *executable_path; GString* keycmd; -<<<<<<< HEAD:uzbl.h gchar* searchtx; gchar* searchold; -======= - gchar *searchtx; ->>>>>>> b520d89... merge in from salinasv:uzbl.h struct utsname unameinfo; /* system info */ gboolean verbose; } State; |