[gthumb] removed const from type declaration
- From: Paolo Bacchilega <paobac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gthumb] removed const from type declaration
- Date: Sat, 4 Apr 2015 19:28:48 +0000 (UTC)
commit 37be1417402aebab0e39ad6a0d58ec1f699da92c
Author: Paolo Bacchilega <paobac src gnome org>
Date: Sat Apr 4 21:22:32 2015 +0200
removed const from type declaration
const is not well supported by C when used for array of strings.
gthumb/glib-utils.c | 4 ++--
gthumb/glib-utils.h | 4 ++--
gthumb/gth-main.c | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/gthumb/glib-utils.c b/gthumb/glib-utils.c
index 7d4dd15..cf63930 100644
--- a/gthumb/glib-utils.c
+++ b/gthumb/glib-utils.c
@@ -1347,8 +1347,8 @@ _g_strv_prepend (char **str_array,
char **
-_g_strv_concat (const char *const *strv1,
- const char *const *strv2)
+_g_strv_concat (char **strv1,
+ char **strv2)
{
char **result;
int i, j;
diff --git a/gthumb/glib-utils.h b/gthumb/glib-utils.h
index 5a9d76c..763ca26 100644
--- a/gthumb/glib-utils.h
+++ b/gthumb/glib-utils.h
@@ -215,8 +215,8 @@ gboolean _g_strv_contains (char **v,
const char *s);
char ** _g_strv_prepend (char **str_array,
const char *str);
-char ** _g_strv_concat (const char *const *strv1,
- const char *const *strv2);
+char ** _g_strv_concat (char **strv1,
+ char **strv2);
gboolean _g_strv_remove (char **str_array,
const char *str);
char * _g_str_remove_suffix (const char *s,
diff --git a/gthumb/gth-main.c b/gthumb/gth-main.c
index 3f4ff45..7f6e1fa 100644
--- a/gthumb/gth-main.c
+++ b/gthumb/gth-main.c
@@ -1267,7 +1267,7 @@ gth_main_activate_extensions (void)
user_actived_extensions = g_strdupv ((char **) default_extensions);
g_settings_set_strv (settings, PREF_GENERAL_ACTIVE_EXTENSIONS, (const char *const *)
user_actived_extensions);
}
- actived_extensions = _g_strv_concat (mandatory_extensions, (const char *const *)
user_actived_extensions);
+ actived_extensions = _g_strv_concat (mandatory_extensions, user_actived_extensions);
ordered_extensions = gth_extension_manager_order_extensions (Main->priv->extension_manager,
actived_extensions);
manager = gth_main_get_default_extension_manager ();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]