From 91ea0edbd74002aa4ac22873300cea794ea4ece6 Mon Sep 17 00:00:00 2001 From: mutantturkey Date: Wed, 4 May 2011 22:24:39 -0400 Subject: fixed the history loading issue, all clean :) --- sb.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/sb.c b/sb.c index f181e62..7b37315 100644 --- a/sb.c +++ b/sb.c @@ -5,14 +5,11 @@ #include #include #include -#include -#include #include #include #include #include #include -#include typedef struct tab { GtkWidget *scroll; @@ -173,7 +170,7 @@ fclose(history); /* an alternative to the regular tab command, combines tabbing and history command into one */ static void tab_and_go() { gchar *returned; -g_spawn_command_line_sync("sh -c 'sort ~"DEFAULT_HISTORY_FILE" | dmenu -l 15 -xs -c'", &returned, NULL, NULL, NULL); +g_spawn_command_line_sync(g_strconcat("sh -c 'sort ", g_build_filename(g_get_home_dir(), ".sb_history"), " | dmenu -l 15 -xs -c'", NULL), &returned, NULL, NULL, NULL); if(strcmp(returned, "") == 0) { focus_view(); } else { tab_new(FALSE); load_uri(returned); g_free(returned); } @@ -327,7 +324,7 @@ gtk_widget_grab_focus(w.bar); /* call the history command. should we do it ASYNC?*/ static void history_command() { gchar *returned; -g_spawn_command_line_sync("sh -c 'sort ~" DEFAULT_HISTORY_FILE " | dmenu -l 15 -xs -c'", &returned, NULL, NULL, NULL); +g_spawn_command_line_sync(g_strconcat("sh -c 'sort ~", g_build_filename(g_get_home_dir(), DEFAULT_HISTORY_FILE), " | dmenu -l 15 -xs -c'", NULL), &returned, NULL, NULL, NULL); if(strcmp(returned, "") == 0) { focus_view(); } else { load_uri(returned); } g_free(returned); } @@ -368,13 +365,14 @@ w.search = gtk_entry_new(); w.status = gtk_statusbar_new(); gtk_entry_set_has_frame(GTK_ENTRY(w.bar), FALSE); -gtk_notebook_set_scrollable(GTK_NOTEBOOK(w.notebook), TRUE); +gtk_notebook_set_scrollable(GTK_NOTEBOOK(w.notebook), TRUE) ; gtk_statusbar_set_has_resize_grip(GTK_STATUSBAR(w.status), FALSE); gtk_notebook_set_show_border(GTK_NOTEBOOK(w.notebook), FALSE); +gtk_notebook_set_tab_border(GTK_NOTEBOOK(w.notebook), 0); -gtk_box_pack_start(GTK_BOX (w.vbox), w.bar, FALSE, FALSE, 1); +gtk_box_pack_start(GTK_BOX (w.vbox), w.bar, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(w.vbox), w.notebook, TRUE, TRUE, 0); -gtk_box_pack_start(GTK_BOX(w.vbox), w.search, FALSE, FALSE, 1); +gtk_box_pack_start(GTK_BOX(w.vbox), w.search, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(w.vbox), w.status, FALSE, FALSE, 0); -- cgit v1.2.3