From 245174790c6155fda1c19eeeeb53071c8e9e64ee Mon Sep 17 00:00:00 2001
From: mutantturkey <crazycal00@gmail.com>
Date: Thu, 19 May 2011 14:56:54 -0400
Subject: cleaning stuff up, added DEFAULT_STYLE_SHEET, removed useless lines

---
 defaults.h |  4 +++-
 sb.c       | 18 +++++++++++++-----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/defaults.h b/defaults.h
index 82051c1..28a17f7 100644
--- a/defaults.h
+++ b/defaults.h
@@ -4,6 +4,7 @@
 #define DEFAULT_TAB_LENGTH 25
 #define DEFAULT_HISTORY_FILE ".sb_history"
 #define DEFAULT_COOKIE_FILE ".sb_cookies"
+#define DEFAULT_STYLE_SHEET ".sb_stylesheet"
 #define DEFAULT_ZOOM_INCREMENT .05
 #define DEFAULT_ZOOM_LEVEL .80
 #define DEFAULT_HEIGHT 900
@@ -30,8 +31,9 @@ struct {
   gboolean hide;
   GtkWidget *win;
   GtkWidget *bar;	
-  GtkWidget *search; 
+  GtkWidget *searchbar; 
   GtkWidget *vbox;
+  GtkWidget *hbox;
   GtkNotebook *notebook; 
   GtkWidget *status;
   GtkWidget *status_info; } w;
diff --git a/sb.c b/sb.c
index 7e223b7..b924d6a 100644
--- a/sb.c
+++ b/sb.c
@@ -163,6 +163,7 @@ void tab_view_source() {
 /* create a tab */
 void tab_new(gboolean b) {
 
+gchar *stylesheet;
 tab *t;
 t = g_new0(tab, 1);
 
@@ -182,10 +183,14 @@ if (index == 0) {
 gtk_notebook_set_show_tabs(w.notebook, FALSE);
 } else  { gtk_notebook_set_show_tabs(w.notebook, TRUE); }
 
+stylesheet = g_strconcat("file://", g_get_home_dir(), "/", DEFAULT_STYLE_SHEET, NULL);
+
 g_object_set(G_OBJECT(w.webkitsettings), "enable-page-cache", TRUE,
 										 "enable-java-applet", FALSE,
-										 "user-stylesheet-uri", "file:///home/calvin/.surf/style.css", NULL);
-//webkit_web_view_set_settings (WEBKIT_WEB_VIEW(t->view), w.webkitsettings);
+										 "user-stylesheet-uri", stylesheet , NULL);
+										 
+g_free(stylesheet);
+
 gtk_statusbar_push(GTK_STATUSBAR(w.status), 0, "");
 gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(t->scroll), GTK_POLICY_NEVER, GTK_POLICY_NEVER);
 
@@ -210,12 +215,15 @@ gtk_widget_grab_focus(w.bar);
 
 /* call the history command. should we do it ASYNC?*/
 void history_command() {
-gchar *returned, *file;
+gchar *returned, *file, *command;
 file =  g_build_filename(g_get_home_dir(), DEFAULT_HISTORY_FILE, NULL);
-g_spawn_command_line_sync(g_strconcat("sh -c 'sort ", file, " | dmenu -l 15 -xs -c'", NULL), &returned, NULL, NULL, NULL);	
+command = g_strconcat("sh -c 'sort ", file, " | dmenu -l 15 -xs -c'", NULL);
+g_spawn_command_line_sync(command, &returned, NULL, NULL, NULL);	
 if(strcmp(returned, "") == 0) { focus_view(); } else { load_uri(returned); }
+
 g_free(returned);
 g_free(file);
+g_free(command);
 }
 
 
@@ -227,6 +235,7 @@ struct tab *t = get_tab(NULL, page_num);
 
 const char *url = webkit_web_view_get_uri(t->view);
 const char *title = webkit_web_view_get_title(t->view);
+
 if (title == NULL && url == NULL) {
 title = "sb";
 url = "";
@@ -257,7 +266,6 @@ w.searchbar = gtk_entry_new();
 w.status = gtk_statusbar_new();
 
 gtk_entry_set_has_frame(GTK_ENTRY(w.bar), FALSE);
-//gtk_entry_set_icon_from_stock(GTK_ENTRY(w.bar), GTK_ENTRY_ICON_PRIMARY, GTK_STOCK_YES);
 
 gtk_notebook_set_scrollable(w.notebook, TRUE);
 gtk_notebook_set_show_border(w.notebook, FALSE);
-- 
cgit v1.2.3