renaming functions to make it more sane, i feel like i also fixed something... hmmm i forget

1 files changed, 17 insertions, 16 deletions

diff --git a/sb.c b/sb.c
index a7dbf58..ed7ba40 100644
--- a/sb.c
+++ b/sb.c
@@ -45,20 +45,20 @@ static struct {
 
 static GQuark term_data_id = 0;
 
-static void activate_uri_entry_cb(GtkWidget* entry, gpointer data);
+static void cb_entry(GtkWidget* entry, gpointer data);
 static void link_hover(WebKitWebView* page, const gchar* title, const gchar* link, gpointer data);
 static void title_change_cb(WebKitWebView *v, WebKitWebFrame *f, const char *title, tab *t);
 static void load_commit_cb (WebKitWebView* page, WebKitWebFrame* frame, tab *t);
 static void load_uri(gchar *uri);
-static void go_cb(gboolean b);
+static void cb_go(gboolean b);
 static void tab_new(gboolean b);
 static void tab_zoom(gboolean b);
 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 cb_download(WebKitWebView *web_view, GObject *download, gpointer user_data);
 static void window_setup();
-static void reload();
+static void tab_reload();
 static void search(GtkEntry *entry, gboolean b);
 static void toggle();
 static void show_search(gboolean b);
@@ -87,7 +87,7 @@ if(b) {
 
 
 /* Called when URL is returned from the entry bar */
-static void activate_uri_entry_cb (GtkWidget* entry, gpointer data) {
+static void cb_entry (GtkWidget* entry, gpointer data) {
 struct tab *t = get_tab(NULL, gtk_notebook_get_current_page(GTK_NOTEBOOK(w.notebook)));
 load_uri(g_strdup(gtk_entry_get_text (GTK_ENTRY (w.bar))));
 gtk_widget_grab_focus(GTK_WIDGET(t->view));
@@ -101,7 +101,7 @@ w.hide = FALSE;
 
 
 /* Basic reload function */
-static void reload() {
+static void tab_reload() {
   
 	struct tab *t = get_tab(NULL, gtk_notebook_get_current_page(GTK_NOTEBOOK(w.notebook)));
 	webkit_web_view_reload(t->view);
@@ -125,7 +125,7 @@ if (gtk_notebook_get_n_pages(GTK_NOTEBOOK(w.notebook)) == 0) { gtk_main_quit();
 
 /* download with external command */
 /* NEEDS WORK, should use sprintf to insert different values, 1) Location 2) File name */
-static void download(WebKitWebView *web_view, GObject *d, gpointer user_data) {
+static void cb_download(WebKitWebView *web_view, GObject *d, gpointer user_data) {
 const gchar *c = webkit_download_get_uri(WEBKIT_DOWNLOAD(d));
 gchar *command = g_strconcat(DEFAULT_DOWNLOAD, g_get_home_dir(), "/ ", g_strdup(c), NULL);
 puts(command);
@@ -208,7 +208,7 @@ if(!gtk_widget_get_visible(w.bar)) {
 
 
 /* go forward or backwards, simple enough */
-static void go_cb (gboolean b) {
+static void cb_go(gboolean b) {
 struct tab *t = get_tab(NULL, gtk_notebook_get_current_page(GTK_NOTEBOOK(w.notebook)));
 if (b) {  webkit_web_view_go_forward(t->view); }
 else { webkit_web_view_go_back(t->view); }
@@ -307,7 +307,7 @@ webkit_web_view_set_zoom_level(t->view, .80);
 g_signal_connect (G_OBJECT (t->view), "title-changed", G_CALLBACK (title_change_cb), t);
 g_signal_connect (G_OBJECT (t->view), "load-committed", G_CALLBACK (load_commit_cb), t);
 g_signal_connect (G_OBJECT (t->view), "hovering-over-link", G_CALLBACK (link_hover), t->view);
-g_signal_connect (G_OBJECT (t->view), "download-requested", G_CALLBACK (download), t->view);
+g_signal_connect (G_OBJECT (t->view), "download-requested", G_CALLBACK (cb_download), t->view);
 g_signal_connect (G_OBJECT (t->view), "create-web-view", G_CALLBACK (tab_new_requested), NULL);
 /*settings*/
 
@@ -361,10 +361,10 @@ w.vbox = gtk_vbox_new(FALSE, 0);
 w.notebook = gtk_notebook_new();
 w.bar = gtk_entry_new ();
 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);
-w.status = gtk_statusbar_new();
 gtk_statusbar_set_has_resize_grip(GTK_STATUSBAR(w.status), FALSE);
 gtk_notebook_set_show_border(GTK_NOTEBOOK(w.notebook), FALSE);
 
@@ -380,17 +380,18 @@ w.webkitsettings = webkit_web_settings_new();
 w.webkitwindowfeatures = webkit_web_window_features_new();
 
 tab_new(FALSE);
+
 g_signal_connect (G_OBJECT (w.search), "activate", G_CALLBACK (search), GINT_TO_POINTER(1));
-g_signal_connect (G_OBJECT (w.bar), "activate", G_CALLBACK (activate_uri_entry_cb), NULL);
+g_signal_connect (G_OBJECT (w.bar), "activate", G_CALLBACK (cb_entry), NULL);
 g_signal_connect (G_OBJECT(w.notebook), "switch-page", G_CALLBACK(tab_focus), NULL);
 g_signal_connect (G_OBJECT (w.win), "destroy", G_CALLBACK (gtk_main_quit), NULL);
 g_signal_connect(w.win, "key-press-event", G_CALLBACK(key_press_cb), NULL);
-gtk_container_add (GTK_CONTAINER (w.win), w.vbox);
-
 
+gtk_container_add (GTK_CONTAINER (w.win), w.vbox);
 gtk_widget_show_all (w.win);
 gtk_widget_hide(w.search);
 gtk_widget_grab_focus(w.bar);
+
 }
 
 
@@ -403,8 +404,8 @@ if ( (event->state & GDK_CONTROL_MASK) == GDK_CONTROL_MASK ) {
     case GDK_l: grab_bar(); return TRUE; break;
     case GDK_f: show_search(TRUE);	return TRUE; break;
     case GDK_g: tab_and_go(); return TRUE; break;
-    case GDK_LEFTBUTTON: go_cb(FALSE); return TRUE; break;
-    case GDK_RIGHTBUTTON: go_cb(TRUE); return TRUE; break;
+    case GDK_LEFTBUTTON: cb_go(FALSE); return TRUE; break;
+    case GDK_RIGHTBUTTON: cb_go(TRUE); return TRUE; break;
     case GDK_o: history_command(); return TRUE; break;
     case GDK_h: toggle(); focus_view(); return TRUE; break;
     case GDK_Page_Up: tab_switch(FALSE); return TRUE; break;
@@ -413,7 +414,7 @@ if ( (event->state & GDK_CONTROL_MASK) == GDK_CONTROL_MASK ) {
     case GDK_w: tab_close(); return TRUE; break;
     case GDK_bracketright: tab_zoom(TRUE); return TRUE; break;
     case GDK_bracketleft: tab_zoom(FALSE); return TRUE; break;
-    case GDK_r: reload(); return TRUE; break;
+    case GDK_r: tab_reload(); return TRUE; break;
 	  case GDK_s: tab_view_source(); return TRUE; break;
 	  case GDK_Return: load_uri(g_strconcat(DEFAULT_SEARCH, gtk_entry_get_text(GTK_ENTRY(w.bar)), NULL)); return TRUE; break;
 	  default: return FALSE; break;