Change autocmd_run function signature.

This leads to easier read code, because we don't need to use NULL as first
function parameter.

diff --git a/src/autocmd.c b/src/autocmd.c
index 2855736..9ef8827 100644 (file)
--- a/src/autocmd.c
+++ b/src/autocmd.c
@@ -242,7 +242,7 @@ gboolean autocmd_add(char *name, gboolean delete)
 /**
  * Run named auto command.
  */
-gboolean autocmd_run(const char *group, AuEvent event, const char *uri)
+gboolean autocmd_run(AuEvent event, const char *uri, const char *group)
 {
     GSList  *lg, *lc;
     AuGroup *grp;

diff --git a/src/autocmd.h b/src/autocmd.h
index ac31be7..4b91c5f 100644 (file)
--- a/src/autocmd.h
+++ b/src/autocmd.h
@@ -42,7 +42,7 @@ void autocmd_init(void);
 void autocmd_cleanup(void);
 gboolean autocmd_augroup(char *name, gboolean delete);
 gboolean autocmd_add(char *name, gboolean delete);
-gboolean autocmd_run(const char *group, AuEvent event, const char *uri);
+gboolean autocmd_run(AuEvent event, const char *uri, const char *group);
 
 #endif /* end of include guard: _AUTOCMD_H */
 #endif

diff --git a/src/main.c b/src/main.c
index 69b1e26..8fa3765 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -512,7 +512,7 @@ static void webview_load_status_cb(WebKitWebView *view, GParamSpec *pspec)
     switch (webkit_web_view_get_load_status(view)) {
         case WEBKIT_LOAD_PROVISIONAL:
 #ifdef FEATURE_AUTOCMD
-            autocmd_run(NULL, AU_PAGE_LOAD_PROVISIONAL, NULL);
+            autocmd_run(AU_PAGE_LOAD_PROVISIONAL, NULL, NULL);
 #endif
             /* update load progress in statusbar */
             vb.state.progress = 0;
@@ -523,7 +523,7 @@ static void webview_load_status_cb(WebKitWebView *view, GParamSpec *pspec)
         case WEBKIT_LOAD_COMMITTED:
             uri = webkit_web_view_get_uri(view);
 #ifdef FEATURE_AUTOCMD
-            autocmd_run(NULL, AU_PAGE_LOAD_COMMITED, uri);
+            autocmd_run(AU_PAGE_LOAD_COMMITED, uri, NULL);
 #endif
             {
                 WebKitWebFrame *frame = webkit_web_view_get_main_frame(view);
@@ -561,7 +561,7 @@ static void webview_load_status_cb(WebKitWebView *view, GParamSpec *pspec)
         case WEBKIT_LOAD_FIRST_VISUALLY_NON_EMPTY_LAYOUT:
 #ifdef FEATURE_AUTOCMD
             uri = webkit_web_view_get_uri(view);
-            autocmd_run(NULL, AU_PAGE_LOAD_FIRST_LAYOUT, uri);
+            autocmd_run(AU_PAGE_LOAD_FIRST_LAYOUT, uri, NULL);
 #endif
             /* if we load a page from a submitted form, leave the insert mode */
             if (vb.mode->id == 'i') {
@@ -572,7 +572,7 @@ static void webview_load_status_cb(WebKitWebView *view, GParamSpec *pspec)
         case WEBKIT_LOAD_FINISHED:
             uri = webkit_web_view_get_uri(view);
 #ifdef FEATURE_AUTOCMD
-            autocmd_run(NULL, AU_PAGE_LOAD_FINISHED, uri);
+            autocmd_run(AU_PAGE_LOAD_FINISHED, uri, NULL);
 #endif
             /* update load progress in statusbar */
             vb.state.progress = 100;
@@ -588,7 +588,7 @@ static void webview_load_status_cb(WebKitWebView *view, GParamSpec *pspec)
         case WEBKIT_LOAD_FAILED:
 #ifdef FEATURE_AUTOCMD
             uri = webkit_web_view_get_uri(view);
-            autocmd_run(NULL, AU_PAGE_LOAD_FAILED, uri);
+            autocmd_run(AU_PAGE_LOAD_FAILED, uri, NULL);
 #endif
             break;
     }
@@ -1285,7 +1285,7 @@ gboolean vb_download(WebKitWebView *view, WebKitDownload *download, const char *
     }
 
 #ifdef FEATURE_AUTOCMD
-    autocmd_run(NULL, AU_DOWNLOAD_START, webkit_download_get_uri(download));
+    autocmd_run(AU_DOWNLOAD_START, webkit_download_get_uri(download), NULL);
 #endif
     if (use_external && *download_cmd) {
         /* run download with external program */
@@ -1415,12 +1415,12 @@ static void download_progress_cp(WebKitDownload *download, GParamSpec *pspec)
     }
     if (status != WEBKIT_DOWNLOAD_STATUS_FINISHED) {
 #ifdef FEATURE_AUTOCMD
-        autocmd_run(NULL, AU_DOWNLOAD_FAILED, webkit_download_get_uri(download));
+        autocmd_run(AU_DOWNLOAD_FAILED, webkit_download_get_uri(download), NULL);
 #endif
         vb_echo(VB_MSG_ERROR, false, "Error downloading %s", file);
     } else {
 #ifdef FEATURE_AUTOCMD
-        autocmd_run(NULL, AU_DOWNLOAD_FINISHED, webkit_download_get_uri(download));
+        autocmd_run(AU_DOWNLOAD_FINISHED, webkit_download_get_uri(download), NULL);
 #endif
         vb_echo(VB_MSG_NORMAL, false, "Download %s finished", file);
     }