added reload (bypass cache). CTRL+E

3 files changed, 28 insertions, 21 deletions

diff --git a/callbacks.c b/callbacks.c
index 39e0ba7..5fa0747 100644
--- a/callbacks.c
+++ b/callbacks.c
@@ -16,39 +16,41 @@ guint(g) = event->keyval;
 
 if ( (event->state & GDK_CONTROL_MASK) == GDK_CONTROL_MASK ) {
   switch(g) {
-    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_KEY_l: grab_bar(); return TRUE; break;
+    case GDK_KEY_f: show_search(TRUE);	return TRUE; break;
+    case GDK_KEY_g: tab_and_go(); return TRUE; break;
     case GDK_KEY_comma: cb_go(FALSE); return TRUE; break;
     case GDK_KEY_period: 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;
-    case GDK_Page_Down: tab_switch(TRUE); return TRUE; break;
-    case GDK_t: tab_new(FALSE); gtk_widget_grab_focus(w.bar); return TRUE; break;
-    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: 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;
+    case GDK_KEY_o: history_command(); return TRUE; break;
+    case GDK_KEY_h: toggle(); focus_view(); return TRUE; break;
+    case GDK_KEY_Page_Up: tab_switch(FALSE); return TRUE; break;
+    case GDK_KEY_Page_Down: tab_switch(TRUE); return TRUE; break;
+    case GDK_KEY_t: tab_new(FALSE); gtk_widget_grab_focus(w.bar); return TRUE; break;
+    case GDK_KEY_w: tab_close(); return TRUE; break;
+    case GDK_KEY_bracketright: tab_zoom(TRUE); return TRUE; break;
+    case GDK_KEY_bracketleft: tab_zoom(FALSE); return TRUE; break;
+    case GDK_KEY_r: tab_reload(TRUE); return TRUE; break;
+    case GDK_KEY_e: tab_reload(FALSE); return TRUE; break;
+	  case GDK_KEY_s: tab_view_source(); return TRUE; break;
+	  case GDK_KEY_Return: load_uri(g_strconcat(DEFAULT_SEARCH, gtk_entry_get_text(GTK_ENTRY(w.bar)), NULL)); return TRUE; break;
 	  default: return FALSE; break;
   }
 
 }
 
-if (gtk_widget_has_focus(w.bar) && g == GDK_Escape) {	gtk_widget_grab_focus(GTK_WIDGET(w.notebook)); return TRUE; }
+if (gtk_widget_has_focus(w.bar) && g == GDK_KEY_Escape) {	gtk_widget_grab_focus(GTK_WIDGET(w.notebook)); return TRUE; }
 if (gtk_widget_has_focus(w.searchbar)) {
-		if (g == GDK_Escape) { show_search(FALSE); focus_view(); return TRUE; }
-		if ((g == GDK_Return) && (event->state & GDK_MOD1_MASK) == GDK_MOD1_MASK) { search(NULL, FALSE); }
+		if (g == GDK_KEY_Escape) { show_search(FALSE); focus_view(); return TRUE; }
+		if ((g == GDK_KEY_Return) && (event->state & GDK_MOD1_MASK) == GDK_MOD1_MASK) { search(NULL, FALSE); }
 }
 return FALSE;
 }
 
 /* download callback */
 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);
+gchar *command = g_strconcat(DEFAULT_DOWNLOAD_COMMAND, DEFAULT_DOWNLOAD_LOCATION, "/ ", g_strdup(c), NULL);
 g_spawn_command_line_async(command, NULL);
 g_free(command);
 }
diff --git a/sb.c b/sb.c
index 972f8bf..1e099f0 100644
--- a/sb.c
+++ b/sb.c
@@ -42,10 +42,15 @@ if(b) {
 
 
 /* Basic reload function */
-void tab_reload() {
+void tab_reload(gboolean b) {
 struct tab *t = get_tab(NULL, gtk_notebook_get_current_page(w.notebook));
+if(b) {
 webkit_web_view_reload(t->view);  
 }
+else {
+webkit_web_view_reload_bypass_cache(t->view);
+}
+}
 
 
 /* close tab, and quit if there are no tabs */
diff --git a/sb.h b/sb.h
index c45fbab..af8b68c 100644
--- a/sb.h
+++ b/sb.h
@@ -5,9 +5,9 @@ void tab_new(gboolean b);
 void tab_zoom(gboolean b);
 void tab_close();
 void tab_and_go();
-void tab_focus(GtkNotebook *notebook, GtkNotebookPage *page, guint page_num, gpointer user_data);
+void tab_focus(GtkNotebook *notebook, GtkWidget *page, guint page_num, gpointer user_data);
 void tab_view_source();
-void tab_reload();
+void tab_reload(gboolean b);
 void window_setup();
 void search(GtkEntry *entry, gboolean b);
 void toggle();