code cleanups, simplifying stuff

1 files changed, 16 insertions, 25 deletions

diff --git a/sb.c b/sb.c
index b76ed09..f97a630 100644
--- a/sb.c
+++ b/sb.c
@@ -23,7 +23,7 @@ static struct {	WebKitWebSettings *webkitsettings; GtkWidget *win;	GtkWidget *ba
 #define DEFAULT_SEARCH "http://www.google.com/search?q="
 #define DEFAULT_FONT  "san-serif"
 #define DEFAULT_TAB_LENGTH 25
-
+#define DEFAULT_HISTORY_FILE "/.sb_history"
 
 
 
@@ -41,7 +41,7 @@ static void tab_close();
 static void tab_and_go();
 static void tab_focus(GtkNotebook *notebook, GtkNotebookPage *page, guint page_num, gpointer user_data);
 static void download(WebKitWebView *web_view, GObject *download, gpointer user_data);
-static void config();
+static void window_setup();
 static void reload();
 static void search(GtkEntry *entry, gboolean b);
 static void toggle();
@@ -117,7 +117,7 @@ gtk_entry_set_text (GTK_ENTRY (w.bar), uri);
 }
 
 
-FILE *history  = fopen(g_strconcat(g_get_home_dir(), "/.history", NULL), "a+");
+FILE *history  = fopen(g_strconcat(g_get_home_dir(), DEFAULT_HISTORY_FILE, NULL), "a+");
 fprintf(history, "%s \n", uri);
 fclose(history);
 }
@@ -125,7 +125,7 @@ fclose(history);
 static void tab_and_go() {
 	
 gchar *returned;
-g_spawn_command_line_sync("sh -c 'sort ~/.history | dmenu -l 15 -xs -c'", &returned, NULL, NULL, NULL);	
+g_spawn_command_line_sync("sh -c 'sort ~"DEFAULT_HISTORY_FILE" | dmenu -l 15 -xs -c'", &returned, NULL, NULL, NULL);	
 if(strcmp(returned, "") == 0) { focus_view(); } else { tab_new(); load_uri(returned); }
 
 g_free(returned);
@@ -184,12 +184,11 @@ WebKitWebView * tab_new_requested(WebKitWebView *v, WebKitWebFrame *f) {
 tab_new(); 
 struct tab *t = get_tab(NULL, gtk_notebook_get_current_page(GTK_NOTEBOOK(w.notebook)));
 return t->view;
-
 }
 static void tab_view_source() {
 struct tab *t = get_tab(NULL, gtk_notebook_get_current_page(GTK_NOTEBOOK(w.notebook)));
-gboolean(b) = webkit_web_view_get_view_source_mode(t->view);
-if(b) { webkit_web_view_set_view_source_mode(t->view, FALSE); }
+
+if(webkit_web_view_get_view_source_mode(t->view)) { webkit_web_view_set_view_source_mode(t->view, FALSE); }
 else { webkit_web_view_set_view_source_mode(t->view, TRUE); }
 webkit_web_view_reload(t->view);
 
@@ -204,10 +203,6 @@ t->label = gtk_label_new("new tab");
 
 
 /*reset status bar*/
-gtk_statusbar_push(GTK_STATUSBAR(w.status), 0, "");
-
-gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(t->scroll), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-
 gtk_container_add(GTK_CONTAINER(t->scroll), GTK_WIDGET(t->view));
 
 int index = gtk_notebook_append_page(GTK_NOTEBOOK(w.notebook), t->scroll, t->label);
@@ -218,7 +213,10 @@ if (index == 0) {
 gtk_notebook_set_show_tabs(GTK_NOTEBOOK(w.notebook), FALSE);
 } else  { gtk_notebook_set_show_tabs(GTK_NOTEBOOK(w.notebook), TRUE); }
 
-webkit_web_view_set_settings (WEBKIT_WEB_VIEW(t->view), w.webkitsettings);
+//webkit_web_view_set_settings (WEBKIT_WEB_VIEW(t->view), w.webkitsettings);
+gtk_statusbar_push(GTK_STATUSBAR(w.status), 0, "");
+gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(t->scroll), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+
 
 /*callbacks*/
 g_signal_connect (G_OBJECT (t->view), "title-changed", G_CALLBACK (title_change_cb), t);
@@ -238,16 +236,11 @@ gtk_widget_grab_focus(w.bar);
 
 static void history_command() {
 gchar *returned;
-g_spawn_command_line_sync("sh -c 'sort ~/.history | dmenu -l 15 -xs -c'", &returned, NULL, NULL, NULL);	
+g_spawn_command_line_sync("sh -c 'sort ~" DEFAULT_HISTORY_FILE " | dmenu -l 15 -xs -c'", &returned, NULL, NULL, NULL);	
 if(strcmp(returned, "") == 0) { focus_view(); } else { load_uri(returned); }
-
 g_free(returned);
-
-
 }
 
-
-
 static void tab_focus(GtkNotebook *notebook, GtkNotebookPage *page, guint page_num, gpointer user_data)   {
 
 gtk_statusbar_push(GTK_STATUSBAR(w.status), 0, "");
@@ -266,9 +259,9 @@ static void focus_view() {
 	struct tab *t = get_tab(NULL, gtk_notebook_get_current_page(GTK_NOTEBOOK(w.notebook)));
 	gtk_widget_grab_focus(GTK_WIDGET(t->view));	
 }
-static void config() {
+static void window_setup() {
 
-term_data_id = g_quark_from_static_string("sb");
+term_data_id = g_quark_from_static_string("s");
 
 w.vbox = gtk_vbox_new(FALSE, 0);
 w.notebook = gtk_notebook_new();
@@ -288,6 +281,7 @@ gtk_box_pack_start(GTK_BOX(w.vbox), w.status, FALSE, FALSE, 0);
 
 
 w.win = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+// gtk_window_set_default_icon_name("gtk-network");
 gtk_window_set_default_size(GTK_WINDOW(w.win), 800, 800);
 /*
 char property[256], setting[256];
@@ -364,11 +358,8 @@ return FALSE;
 int main (int argc, char* argv[]) {
 gtk_init (&argc, &argv);
 
-config();
-if (argc == 2) {
-load_uri(argv[1]);
-}
-
+window_setup();
+if (argc == 2) {  load_uri(argv[1]); }
 
 gtk_main();