reorganise uzbl-core.h

3 files changed, 27 insertions, 30 deletions

diff --git a/src/callbacks.c b/src/callbacks.c
index a996248..d41c68e 100644
--- a/src/callbacks.c
+++ b/src/callbacks.c
@@ -8,7 +8,7 @@
 #include "events.h"
 #include "util.h"
 #include "io.h"
-
+#include "menu.h"
 
 void
 set_proxy_url() {
diff --git a/src/menu.h b/src/menu.h
index 8b89f2f..03055e5 100644
--- a/src/menu.h
+++ b/src/menu.h
@@ -3,6 +3,14 @@
 
 #include <webkit/webkit.h>
 
+typedef struct {
+    gchar*   name;
+    gchar*   cmd;
+    gboolean issep;
+    guint    context;
+    WebKitHitTestResult* hittest;
+} MenuItem;
+
 void    menu_add(WebKitWebView *page, GArray *argv, GString *result);
 void    menu_add_link(WebKitWebView *page, GArray *argv, GString *result);
 void    menu_add_image(WebKitWebView *page, GArray *argv, GString *result);
diff --git a/src/uzbl-core.h b/src/uzbl-core.h
index 8108e9a..ede271e 100644
--- a/src/uzbl-core.h
+++ b/src/uzbl-core.h
@@ -253,18 +253,31 @@ void        update_title(void);
 void        catch_sigterm(int s);
 sigfunc*    setup_signal(int signe, sigfunc *shandler);
 
-gboolean    set_var_value(const gchar *name, gchar *val);
-
 /* Subprocess spawning */
 void        spawn(GArray *argv, GString *result, gboolean exec);
 void        spawn_sh(GArray *argv, GString *result);
 
+/* Configuration variables */
+gboolean    set_var_value(const gchar *name, gchar *val);
+gboolean    valid_name(const gchar* name);
+void        act_dump_config();
+void        act_dump_config_as_events();
+void        dump_var_hash(gpointer k, gpointer v, gpointer ud);
+void        dump_key_hash(gpointer k, gpointer v, gpointer ud);
+void        dump_config();
+void        dump_config_as_events();
+
 /* Running commands */
+gchar*      expand(const char* s, guint recurse);
 gboolean    run_command(const gchar *command, const gchar **args, const gboolean sync,
                 char **output_stdout);
 void        run_command_file(const gchar *path);
 void        parse_command(const char *cmd, const char *param, GString *result);
 void        parse_cmd_line(const char *ctl_line, GString *result);
+const CommandInfo *
+            parse_command_parts(const gchar *line, GArray *a);
+void        parse_command_arguments(const gchar *p, GArray *a, gboolean no_split);
+void        run_parsed_command(const CommandInfo *c, GArray *a, GString *result);
 
 /* Keyboard events functions */
 gboolean    key_press_cb(GtkWidget* window, GdkEventKey* event);
@@ -276,7 +289,6 @@ void        create_scrolled_win();
 GtkWidget*  create_mainbar();
 GtkWidget*  create_window();
 GtkPlug*    create_plug();
-void        run_handler(const gchar *act, const gchar *args);
 void        settings_init();
 
 /* Search functions */
@@ -291,38 +303,15 @@ void        handle_authentication (SoupSession *session,
                             SoupAuth    *auth,
                             gboolean     retrying,
                             gpointer     user_data);
-gboolean    valid_name(const gchar* name);
-void        act_dump_config();
-void        act_dump_config_as_events();
-void        dump_var_hash(gpointer k, gpointer v, gpointer ud);
-void        dump_key_hash(gpointer k, gpointer v, gpointer ud);
-void        dump_config();
-void        dump_config_as_events();
 
-void        retrieve_geometry();
 void        init_connect_socket();
 gboolean    remove_socket_from_array(GIOChannel *chan);
-void        scroll(GtkAdjustment* bar, gchar *amount_str);
 
+/* Window */
+void        retrieve_geometry();
+void        scroll(GtkAdjustment* bar, gchar *amount_str);
 gint        get_click_context();
-gchar*      expand(const char* s, guint recurse);
-
-const CommandInfo *
-parse_command_parts(const gchar *line, GArray *a);
 
-void
-parse_command_arguments(const gchar *p, GArray *a, gboolean no_split);
-
-void
-run_parsed_command(const CommandInfo *c, GArray *a, GString *result);
-
-typedef struct {
-    gchar*   name;
-    gchar*   cmd;
-    gboolean issep;
-    guint    context;
-    WebKitHitTestResult* hittest;
-} MenuItem;
 
 #endif
 /* vi: set et ts=4: */