From c6e3ebf8f8d81691e0055d25786ac23dbb313706 Mon Sep 17 00:00:00 2001
From: Daniel Carl <danielcarl@gmx.de>
Date: Sun, 12 May 2013 21:31:56 +0200
Subject: [PATCH] Removed typedefs from command.h file.

These definitions where used only local, so there is no need to make them
public via header file.
---
 src/command.c | 32 +++++++++++++++++++++++++++++---
 src/command.h | 23 -----------------------
 src/hints.c   |  2 +-
 3 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/src/command.c b/src/command.c
index 27c2cdb..4c3522e 100644
--- a/src/command.c
+++ b/src/command.c
@@ -29,6 +29,32 @@
 #include "bookmark.h"
 #include "dom.h"
 
+/*
+bitmap
+1: primary cliboard
+2: secondary cliboard
+3: yank uri
+4: yank selection
+*/
+enum {
+    COMMAND_YANK_URI       = (VB_CLIPBOARD_SECONDARY<<1),
+    COMMAND_YANK_SELECTION = (VB_CLIPBOARD_SECONDARY<<2)
+};
+
+enum {
+    COMMAND_ZOOM_OUT,
+    COMMAND_ZOOM_IN,
+    COMMAND_ZOOM_FULL  = (1<<1),
+    COMMAND_ZOOM_RESET = (1<<2)
+};
+
+typedef gboolean (*Command)(const Arg *arg);
+typedef struct {
+    const char *name;
+    Command    function;
+    const Arg  arg;       /* arguments to call the command with */
+} CommandInfo;
+
 typedef struct {
     char    *file;
     Element *element;
@@ -41,7 +67,7 @@ extern const unsigned int INPUT_LENGTH;
 
 static GHashTable *commands;
 static CommandInfo cmd_list[] = {
-    /* command               function                      mode */
+    /* command               function                      arg */
     {"open",                 command_open,                 {VB_TARGET_CURRENT, ""}},
     {"tabopen",              command_open,                 {VB_TARGET_NEW, ""}},
     {"open-closed",          command_open_closed,          {VB_TARGET_CURRENT}},
@@ -83,8 +109,8 @@ static CommandInfo cmd_list[] = {
     {"hint-image-open",      command_hints,                {HINTS_TYPE_IMAGE | HINTS_PROCESS_OPEN, ";i"}},
     {"hint-image-tabopen",   command_hints,                {HINTS_TYPE_IMAGE | HINTS_PROCESS_OPEN | HINTS_OPEN_NEW, ";I"}},
     {"hint-editor",          command_hints,                {HINTS_TYPE_EDITABLE, ";e"}},
-    {"yank-uri",             command_yank,                 {COMMAND_YANK_PRIMARY | COMMAND_YANK_SECONDARY | COMMAND_YANK_URI}},
-    {"yank-selection",       command_yank,                 {COMMAND_YANK_PRIMARY | COMMAND_YANK_SECONDARY | COMMAND_YANK_SELECTION}},
+    {"yank-uri",             command_yank,                 {VB_CLIPBOARD_PRIMARY | VB_CLIPBOARD_SECONDARY | COMMAND_YANK_URI}},
+    {"yank-selection",       command_yank,                 {VB_CLIPBOARD_PRIMARY | VB_CLIPBOARD_SECONDARY | COMMAND_YANK_SELECTION}},
     {"open-clipboard",       command_paste,                {VB_CLIPBOARD_PRIMARY | VB_CLIPBOARD_SECONDARY | VB_TARGET_CURRENT}},
     {"tabopen-clipboard",    command_paste,                {VB_CLIPBOARD_PRIMARY | VB_CLIPBOARD_SECONDARY | VB_TARGET_NEW}},
     {"search-forward",       command_search,               {VB_SEARCH_FORWARD}},
diff --git a/src/command.h b/src/command.h
index b6cc227..b7f49f7 100644
--- a/src/command.h
+++ b/src/command.h
@@ -20,29 +20,6 @@
 #ifndef _COMMAND_H
 #define _COMMAND_H
 
-enum {
-    COMMAND_YANK_PRIMARY   = VB_CLIPBOARD_PRIMARY,
-    COMMAND_YANK_SECONDARY = VB_CLIPBOARD_SECONDARY,
-    COMMAND_YANK_URI       = (COMMAND_YANK_SECONDARY<<1),
-    COMMAND_YANK_SELECTION = (COMMAND_YANK_SECONDARY<<2)
-};
-
-enum {
-    COMMAND_ZOOM_OUT,
-    COMMAND_ZOOM_IN,
-    COMMAND_ZOOM_FULL  = (1<<1),
-    COMMAND_ZOOM_RESET = (1<<2)
-};
-
-typedef gboolean (*Command)(const Arg *arg);
-
-typedef struct {
-    const char *name;
-    Command    function;
-    const Arg  arg;       /* arguments to call the command with */
-} CommandInfo;
-
-
 void command_init(void);
 GList *command_get_all(void);
 void command_cleanup(void);
diff --git a/src/hints.c b/src/hints.c
index 0f49c2c..2df9f17 100644
--- a/src/hints.c
+++ b/src/hints.c
@@ -165,7 +165,7 @@ static void run_script(char *js)
             command_input(&a);
             g_free(a.s);
         } else {
-            a.i = COMMAND_YANK_PRIMARY | COMMAND_YANK_SECONDARY;
+            a.i = VB_CLIPBOARD_PRIMARY | VB_CLIPBOARD_SECONDARY;
             a.s = v;
             command_yank(&a);
         }
-- 
2.20.1