From 669bc909d8310668334d3f2ad4870ac5d78a4017 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 20 Jun 2014 15:17:18 -0400 Subject: [PATCH] GtkIconTheme: Trivial cleanup Drop the _-prefix from a static function. We've agreed to no stop using those prefixes. --- gtk/gtkicontheme.c | 59 +++++++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 30 deletions(-) diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c index e9db6d4147..929377908d 100644 --- a/gtk/gtkicontheme.c +++ b/gtk/gtkicontheme.c @@ -4156,13 +4156,13 @@ symbolic_cache_get_proxy (SymbolicPixbufCache *symbolic_cache, } static GdkPixbuf * -_gtk_icon_info_load_symbolic_internal (GtkIconInfo *icon_info, - const GdkRGBA *fg, - const GdkRGBA *success_color, - const GdkRGBA *warning_color, - const GdkRGBA *error_color, - gboolean use_cache, - GError **error) +gtk_icon_info_load_symbolic_internal (GtkIconInfo *icon_info, + const GdkRGBA *fg, + const GdkRGBA *success_color, + const GdkRGBA *warning_color, + const GdkRGBA *error_color, + gboolean use_cache, + GError **error) { GInputStream *stream; GdkPixbuf *pixbuf; @@ -4367,11 +4367,11 @@ gtk_icon_info_load_symbolic (GtkIconInfo *icon_info, if (!is_symbolic) return gtk_icon_info_load_icon (icon_info, error); - return _gtk_icon_info_load_symbolic_internal (icon_info, - fg, success_color, - warning_color, error_color, - TRUE, - error); + return gtk_icon_info_load_symbolic_internal (icon_info, + fg, success_color, + warning_color, error_color, + TRUE, + error); } /** @@ -4448,11 +4448,11 @@ gtk_icon_info_load_symbolic_for_context (GtkIconInfo *icon_info, if (gtk_style_context_lookup_color (context, "error_color", &error_color)) error_colorp = &error_color; - return _gtk_icon_info_load_symbolic_internal (icon_info, - fgp, success_colorp, - warning_colorp, error_colorp, - TRUE, - error); + return gtk_icon_info_load_symbolic_internal (icon_info, + fgp, success_colorp, + warning_colorp, error_colorp, + TRUE, + error); } typedef struct { @@ -4505,14 +4505,13 @@ load_symbolic_icon_thread (GTask *task, GdkPixbuf *pixbuf; error = NULL; - pixbuf = - _gtk_icon_info_load_symbolic_internal (data->dup, - data->fg_set ? &data->fg : NULL, - data->success_color_set ? &data->success_color : NULL, - data->warning_color_set ? &data->warning_color : NULL, - data->error_color_set ? &data->error_color : NULL, - FALSE, - &error); + pixbuf = gtk_icon_info_load_symbolic_internal (data->dup, + data->fg_set ? &data->fg : NULL, + data->success_color_set ? &data->success_color : NULL, + data->warning_color_set ? &data->warning_color : NULL, + data->error_color_set ? &data->error_color : NULL, + FALSE, + &error); if (pixbuf == NULL) g_task_return_error (task, error); else @@ -4848,11 +4847,11 @@ gtk_icon_info_load_symbolic_for_style (GtkIconInfo *icon_info, if (gtk_style_lookup_color (style, "error_color", &color)) error_colorp = color_to_rgba (&color, &error_color); - return _gtk_icon_info_load_symbolic_internal (icon_info, - &fg, success_colorp, - warning_colorp, error_colorp, - TRUE, - error); + return gtk_icon_info_load_symbolic_internal (icon_info, + &fg, success_colorp, + warning_colorp, error_colorp, + TRUE, + error); } /**