diff --git a/ChangeLog b/ChangeLog index 1e832014ca..f114b5ce50 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-03-04 David Hampton + + * src/gnome-utils/dialog-account.c: + * lib/glib26/gkeyfile.c: + * lib/glib26/gutils26.[ch]: Make g_strv_length available outside + of the gkeyfile compatability library. + 2006-03-04 Joshua Sled * src/gnome/glade/sched-xact.glade: Fix selection mode on diff --git a/lib/glib26/gkeyfile.c b/lib/glib26/gkeyfile.c index 8bb5ee8c92..9080946f12 100644 --- a/lib/glib26/gkeyfile.c +++ b/lib/glib26/gkeyfile.c @@ -191,32 +191,6 @@ static void g_key_file_flush_parse_buffer (GKeyFile GError **error); -/** - * g_strv_length: - * @str_array: a %NULL-terminated array of strings. - * - * Returns the length of the given %NULL-terminated - * string array @str_array. - * - * Return value: length of @str_array. - * - * From the file gstrfuncs.c - * - * Since: 2.6 - **/ -static guint -g_strv_length (gchar **str_array) -{ - guint i = 0; - - g_return_val_if_fail (str_array != NULL, 0); - - while (str_array[i]) - ++i; - - return i; -} - GQuark g_key_file_error_quark (void) { diff --git a/lib/glib26/gutils26.c b/lib/glib26/gutils26.c index 93384dd350..2f9d3b9d59 100644 --- a/lib/glib26/gutils26.c +++ b/lib/glib26/gutils26.c @@ -1035,6 +1035,30 @@ _glib_gettext (const gchar *str) #endif /* ENABLE_NLS */ +/** + * g_strv_length: + * @str_array: a %NULL-terminated array of strings. + * + * Returns the length of the given %NULL-terminated + * string array @str_array. + * + * Return value: length of @str_array. + * + * Since: 2.6 + **/ +guint +g_strv_length (gchar **str_array) +{ + guint i = 0; + + g_return_val_if_fail (str_array != NULL, 0); + + while (str_array[i]) + ++i; + + return i; +} + #if 0 #define __G_UTILS_C__ #include "galiasdef.c" diff --git a/lib/glib26/gutils26.h b/lib/glib26/gutils26.h index 1fd874e382..544bd30594 100644 --- a/lib/glib26/gutils26.h +++ b/lib/glib26/gutils26.h @@ -180,4 +180,6 @@ DllMain (HINSTANCE hinstDLL, \ } #endif /* G_PLATFORM_WIN32 */ +guint g_strv_length (gchar **str_array); + #endif /* __G_UTILS_26_H__ */ diff --git a/src/gnome-utils/dialog-account.c b/src/gnome-utils/dialog-account.c index b6dea0c14d..f1cb065259 100644 --- a/src/gnome-utils/dialog-account.c +++ b/src/gnome-utils/dialog-account.c @@ -25,6 +25,9 @@ #include "config.h" #include +#ifndef HAVE_GLIB26 +#include "gutils26.h" +#endif #include #include #include