diff options
| author | Jens Granseuer <jensgr@gmx.net> | 2008-04-12 12:12:29 +0000 |
|---|---|---|
| committer | Jens Granseuer <jensg@src.gnome.org> | 2008-04-12 12:12:29 +0000 |
| commit | 394c5698a9463a0ba30b59f32733d0f892ad6d00 (patch) | |
| tree | 425ac8b5eac68aff12ac93795f7ef1007f32989d | |
| parent | 4389eaa5ff91d8ee0d93a566613da7fbc4d8fac6 (diff) | |
| download | gnome-control-center-394c5698a9463a0ba30b59f32733d0f892ad6d00.tar.gz | |
include config.h, use strcmp instead of our home-grown g_str_nequal, and
2008-04-12 Jens Granseuer <jensgr@gmx.net>
* gtkrc-utils.c: (gtkrc_get_details), (gtkrc_get_color_scheme):
* gtkrc-utils.h: include config.h, use strcmp instead of our home-grown
g_str_nequal, and constify the parameter of gtkrc_get_color_scheme
svn path=/trunk/; revision=8645
| -rw-r--r-- | capplets/common/ChangeLog | 6 | ||||
| -rw-r--r-- | capplets/common/gtkrc-utils.c | 25 | ||||
| -rw-r--r-- | capplets/common/gtkrc-utils.h | 2 |
3 files changed, 19 insertions, 14 deletions
diff --git a/capplets/common/ChangeLog b/capplets/common/ChangeLog index e0f0ff3ef..a58699515 100644 --- a/capplets/common/ChangeLog +++ b/capplets/common/ChangeLog @@ -1,3 +1,9 @@ +2008-04-12 Jens Granseuer <jensgr@gmx.net> + + * gtkrc-utils.c: (gtkrc_get_details), (gtkrc_get_color_scheme): + * gtkrc-utils.h: include config.h, use strcmp instead of our home-grown + g_str_nequal, and constify the parameter of gtkrc_get_color_scheme + 2008-03-30 Jens Granseuer <jensgr@gmx.net> * file-transfer-dialog.c: (file_transfer_dialog_init): use diff --git a/capplets/common/gtkrc-utils.c b/capplets/common/gtkrc-utils.c index 89934ae60..d574e253a 100644 --- a/capplets/common/gtkrc-utils.c +++ b/capplets/common/gtkrc-utils.c @@ -19,6 +19,11 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + +#include <string.h> #include <glib.h> #include <glib/gstdio.h> #include <fcntl.h> @@ -28,12 +33,6 @@ #define ENGINE_SYMBOL ((gpointer) 2) #define COLOR_SCHEME_SYMBOL ((gpointer) 3) -static gint -str_nequal (const gchar *a, const gchar *b) -{ - return !g_str_equal (a, b); -} - gchar * gtkrc_find_named (const gchar *name) { @@ -96,7 +95,7 @@ gtkrc_get_details (gchar *filename, GSList **engines, GSList **symbolic_colors) if (filename == NULL) continue; - if (g_slist_find_custom (read_files, filename, (GCompareFunc) str_nequal)) + if (g_slist_find_custom (read_files, filename, (GCompareFunc) strcmp)) { g_warning ("Recursion in the gtkrc detected!"); g_free (filename); @@ -121,7 +120,7 @@ gtkrc_get_details (gchar *filename, GSList **engines, GSList **symbolic_colors) token = g_scanner_get_next_token (scanner); if (token != G_TOKEN_IDENTIFIER) continue; - if (!g_slist_find_custom (*symbolic_colors, scanner->value.v_identifier, (GCompareFunc) str_nequal)) + if (!g_slist_find_custom (*symbolic_colors, scanner->value.v_identifier, (GCompareFunc) strcmp)) *symbolic_colors = g_slist_append (*symbolic_colors, g_strdup (scanner->value.v_identifier)); continue; } @@ -150,7 +149,7 @@ gtkrc_get_details (gchar *filename, GSList **engines, GSList **symbolic_colors) string_token = g_scanner_get_next_token (scanner); if (string_token != G_TOKEN_STRING) continue; - if (!g_slist_find_custom (*engines, scanner->value.v_string, (GCompareFunc) str_nequal)) + if (!g_slist_find_custom (*engines, scanner->value.v_string, (GCompareFunc) strcmp)) *engines = g_slist_append (*engines, g_strdup (scanner->value.v_string)); } @@ -166,7 +165,7 @@ gtkrc_get_details (gchar *filename, GSList **engines, GSList **symbolic_colors) gchar * -gtkrc_get_color_scheme (gchar *filename) +gtkrc_get_color_scheme (const gchar *gtkrc_file) { gint file = -1; gchar *result = NULL; @@ -179,16 +178,16 @@ gtkrc_get_color_scheme (gchar *filename) g_scanner_scope_add_symbol (scanner, 0, "gtk_color_scheme", COLOR_SCHEME_SYMBOL); g_scanner_scope_add_symbol (scanner, 0, "gtk-color-scheme", COLOR_SCHEME_SYMBOL); - files = g_slist_prepend (files, g_strdup (filename)); + files = g_slist_prepend (files, g_strdup (gtkrc_file)); while (files != NULL) { - filename = files->data; + gchar *filename = files->data; files = g_slist_delete_link (files, files); if (filename == NULL) continue; - if (g_slist_find_custom (read_files, filename, (GCompareFunc) str_nequal)) + if (g_slist_find_custom (read_files, filename, (GCompareFunc) strcmp)) { g_warning ("Recursion in the gtkrc detected!"); g_free (filename); diff --git a/capplets/common/gtkrc-utils.h b/capplets/common/gtkrc-utils.h index 2e936c5cb..cde004644 100644 --- a/capplets/common/gtkrc-utils.h +++ b/capplets/common/gtkrc-utils.h @@ -21,5 +21,5 @@ void gtkrc_get_details (gchar *filename, GSList **engines, GSList **symbolic_colors); gchar * gtkrc_find_named (const gchar *name); -gchar * gtkrc_get_color_scheme (gchar *filename); +gchar * gtkrc_get_color_scheme (const gchar *filename); gchar * gtkrc_get_color_scheme_for_theme (const gchar *theme_name); |