viking

commit 272e675bb6162f50636ea5b92d1be32694b9803c
parent ecdf80adf11a92e662112b86fbc29d340e38c3aa
Author: Kyle Milz <kmilz@ucalgary.ca>
Date:   Tue, 25 Sep 2012 21:05:49 -0600

move setup_modkeys() into utilities to clean up include files

Diffstat:
M
src/main.c
 | 
27
---------------------------
M
src/utilities.c
 | 
26
++++++++++++++++++++++++++
M
src/utilities.h
 | 
1
+

3 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/src/main.c b/src/main.c
@@ -18,10 +18,8 @@
 #include "viking.h"
 #include "viking_state.h"
 #include "main.h"
-#include "commands.h"
 #include "utilities.h"
 #include "callbacks.h"
-#include "keymap.h"
 
 #include <stdio.h>				/* asprintf() */
 #include <string.h>				/* strcmp */
@@ -522,31 +520,6 @@ setup_gui(App_Data *ad)
 	ad->web_inspector = web_inspector;
 }
 
-static void
-setup_modkeys(App_Data *ad)
-{
-	Evas *e;
-	Evas_Modifier_Mask mask;
-	unsigned int i;
-
-	ad->modkeys = calloc(LENGTH(keys) + 1, sizeof(char));
-	ad->modkeys[0] = '\0';
-	e = evas_object_evas_get(ad->win);
-
-	for (i = 0; i < LENGTH(keys); i++) {
-		if (keys[i].modkey && !strchr(ad->modkeys, keys[i].modkey)) {
-			// strcat(ad->modkeys, keys[i].modkey);
-			ad->modkeys[strlen(ad->modkeys)] = keys[i].modkey;
-			ad->modkeys[strlen(ad->modkeys) + 1] = '\0';
-		}
-
-		mask = evas_key_modifier_mask_get(e, keys[i].mask);
-		if (keys[i].key && !evas_object_key_grab(ad->win, keys[i].key, mask, 0, EINA_FALSE))
-			fprintf(stderr, "Could not grab trigger for mask = %s, key = %s\n", keys[i].mask , keys[i].key);
-	}
-	fprintf(stderr, "Modkey array looks like %s\n", ad->modkeys);
-}
-
 static char ca_bundle[MAX_SETTING_SIZE] = "/etc/ssl/certs/ca-certificates.crt";
 static Eina_Bool strict_ssl              = TRUE; /* FALSE will accept any SSL certificate at face value */
 
diff --git a/src/utilities.c b/src/utilities.c
@@ -1075,3 +1075,29 @@ userscript_hooks_end(const char *uri)
 {
 }
 
+void
+setup_modkeys(void *data)
+{
+	App_Data *ad = data;
+	Evas *e;
+	Evas_Modifier_Mask mask;
+	unsigned int i;
+
+	ad->modkeys = calloc(LENGTH(keys) + 1, sizeof(char));
+	ad->modkeys[0] = '\0';
+	e = evas_object_evas_get(ad->win);
+
+	for (i = 0; i < LENGTH(keys); i++) {
+		if (keys[i].modkey && !strchr(ad->modkeys, keys[i].modkey)) {
+			// strcat(ad->modkeys, keys[i].modkey);
+			ad->modkeys[strlen(ad->modkeys)] = keys[i].modkey;
+			ad->modkeys[strlen(ad->modkeys) + 1] = '\0';
+		}
+
+		mask = evas_key_modifier_mask_get(e, keys[i].mask);
+		if (keys[i].key && !evas_object_key_grab(ad->win, keys[i].key, mask, 0, EINA_FALSE))
+			fprintf(stderr, "Could not grab trigger for mask = %s, key = %s\n", keys[i].mask , keys[i].key);
+	}
+	fprintf(stderr, "Modkey array looks like %s\n", ad->modkeys);
+}
+
diff --git a/src/utilities.h b/src/utilities.h
@@ -35,6 +35,7 @@ void free_list(Listelement *elementlist);
 char * search_word(int whichword);
 void userscript_hooks_start(const char*);
 void userscript_hooks_end(const char*);
+void setup_modkeys(void *data);
 
 char *find_uri_for_searchengine(const char *handle);
 void make_searchengines_list(Searchengine *searchengines, int length);