Branch: refs/heads/master Author: Frank Lanitz frank@frank.uvena.de Committer: Frank Lanitz frank@frank.uvena.de Date: Sun, 23 Mar 2014 10:26:59 UTC Commit: a6d315e4b3d3ac8563251d9667d1600c9b04e228 https://github.com/geany/geany-plugins/commit/a6d315e4b3d3ac8563251d9667d160...
Log Message: ----------- GeanyVC: Replace NZV-makro with EMPTY-makro
Modified Paths: -------------- geanyvc/src/geanyvc.c geanyvc/src/vc_bzr.c geanyvc/src/vc_cvs.c geanyvc/src/vc_git.c geanyvc/src/vc_hg.c geanyvc/src/vc_svk.c geanyvc/src/vc_svn.c
Modified: geanyvc/src/geanyvc.c 10 files changed, 5 insertions(+), 5 deletions(-) =================================================================== @@ -491,7 +491,7 @@ GSList *get_commit_files_null(G_GNUC_UNUSED const gchar * dir) setptr(*std_out, encodings_convert_to_utf8(*std_out, strlen(*std_out), NULL)); } - if (!NZV(*std_out)) + if (EMPTY(*std_out)) { g_free(*std_out); *std_out = NULL; @@ -509,7 +509,7 @@ GSList *get_commit_files_null(G_GNUC_UNUSED const gchar * dir) setptr(*std_err, encodings_convert_to_utf8(*std_err, strlen(*std_err), NULL)); } - if (!NZV(*std_err)) + if (EMPTY(*std_err)) { g_free(*std_err); *std_err = NULL; @@ -968,7 +968,7 @@ GSList *get_commit_files_null(G_GNUC_UNUSED const gchar * dir) { document_reload_file(doc, NULL);
- if (NZV(text)) + if (!EMPTY(text)) show_output(text, "*VC-UPDATE*", NULL, NULL, 0); g_free(text); } @@ -1604,7 +1604,7 @@ static gboolean commit_text_line_number_update_cb(GtkWidget *widget, GdkEvent *e g_error_free(spellcheck_error); spellcheck_error = NULL; } - else if (NZV(lang)) + else if (!EMPTY(lang)) { gtkspell_set_language(speller, lang, &spellcheck_error); if (spellcheck_error != NULL) @@ -1630,7 +1630,7 @@ static gboolean commit_text_line_number_update_cb(GtkWidget *widget, GdkEvent *e gtk_text_buffer_get_end_iter(mbuf, &end); message = gtk_text_buffer_get_text(mbuf, &begin, &end, FALSE); gtk_tree_model_foreach(model, get_commit_files_foreach, &selected_files); - if (NZV(message) && selected_files) + if (!EMPTY(message) && selected_files) { execute_command(vc, NULL, NULL, dir, VC_COMMAND_COMMIT, selected_files, message);
Modified: geanyvc/src/vc_bzr.c 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -137,7 +137,7 @@ execute_custom_command(dir, (const gchar **) argv, NULL, &std_output, NULL, filename, NULL, NULL);
- if (NZV(std_output)) + if (!EMPTY(std_output)) { ret = TRUE; } @@ -178,7 +178,7 @@ g_return_val_if_fail(base_dir, NULL);
execute_custom_command(base_dir, argv, NULL, &txt, NULL, base_dir, NULL, NULL); - if (!NZV(txt)) + if (EMPTY(txt)) { g_free(base_dir); g_free(txt);
Modified: geanyvc/src/vc_cvs.c 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -167,7 +167,7 @@ const char *argv[] = { "cvs", "-nq", "update", NULL };
execute_custom_command(dir, argv, NULL, &txt, NULL, dir, NULL, NULL); - if (!NZV(txt)) + if (EMPTY(txt)) return NULL; p = txt;
Modified: geanyvc/src/vc_git.c 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -199,7 +199,7 @@
execute_custom_command(dir, (const gchar **) argv, NULL, &std_output, NULL, dir, NULL, NULL); - if (NZV(std_output)) + if (!EMPTY(std_output)) { ret = TRUE; g_free(std_output);
Modified: geanyvc/src/vc_hg.c 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -135,7 +135,7 @@
execute_custom_command(dir, (const gchar **) argv, NULL, &std_output, NULL, dir, NULL, NULL); - if (NZV(std_output)) + if (!EMPTY(std_output)) { ret = TRUE; g_free(std_output); @@ -173,7 +173,7 @@ g_return_val_if_fail(base_dir, NULL);
execute_custom_command(base_dir, argv, NULL, &txt, NULL, base_dir, NULL, NULL); - if (!NZV(txt)) + if (EMPTY(txt)) { g_free(base_dir); g_free(txt);
Modified: geanyvc/src/vc_svk.c 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -178,7 +178,7 @@ const char *argv[] = { "svk", "status", NULL };
execute_custom_command(dir, argv, NULL, &txt, NULL, dir, NULL, NULL); - if (!NZV(txt)) + if (EMPTY(txt)) return NULL; p = txt;
Modified: geanyvc/src/vc_svn.c 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -189,7 +189,7 @@
execute_custom_command(dir, (const gchar **) argv, NULL, &std_output, NULL, dir, NULL, NULL); - if (NZV(std_output)) + if (!EMPTY(std_output)) { ret = TRUE; g_free(std_output); @@ -223,7 +223,7 @@ const char *argv[] = { "svn", "status", NULL };
execute_custom_command(dir, argv, NULL, &txt, NULL, dir, NULL, NULL); - if (!NZV(txt)) + if (EMPTY(txt)) return NULL; p = txt;
-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).