diff options
| author | Alexander Larsson <alexl@redhat.com> | 2020-01-30 10:52:09 +0100 |
|---|---|---|
| committer | Alexander Larsson <alexl@redhat.com> | 2020-01-30 10:53:43 +0100 |
| commit | 27799ba4f5a15cd3a63be371f94688a4c89bfd9f (patch) | |
| tree | 979410bd9ae836296590c921bcaa7e7d6b4e87fc /gtk/gtkapplication-quartz-menu.c | |
| parent | 2ec51b7010fb1fe7d220e8214567aff015db7a36 (diff) | |
| download | gtk+-27799ba4f5a15cd3a63be371f94688a4c89bfd9f.tar.gz | |
Remove final references to "icon info" with just "icon"
Diffstat (limited to 'gtk/gtkapplication-quartz-menu.c')
| -rw-r--r-- | gtk/gtkapplication-quartz-menu.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gtk/gtkapplication-quartz-menu.c b/gtk/gtkapplication-quartz-menu.c index 2d31dc0463..1ed137c41c 100644 --- a/gtk/gtkapplication-quartz-menu.c +++ b/gtk/gtkapplication-quartz-menu.c @@ -103,7 +103,7 @@ icon_loaded (GObject *object, GAsyncResult *result, gpointer user_data) { - GtkIcon *info = GTK_ICON_INFO (object); + GtkIcon *icon = GTK_ICON (object); GNSMenuItem *item = user_data; GError *error = NULL; GdkPixbuf *pixbuf; @@ -117,7 +117,7 @@ icon_loaded (GObject *object, scale = roundf ([[NSScreen mainScreen] backingScaleFactor]); #endif - pixbuf = gtk_icon_load_symbolic_finish (info, result, NULL, &error); + pixbuf = gtk_icon_load_symbolic_finish (icon, result, NULL, &error); if (pixbuf != NULL) { @@ -278,7 +278,7 @@ icon_loaded (GObject *object, static GdkRGBA error; GtkIconTheme *theme; - GtkIcon *info; + GtkIcon *icon; gint scale = 1; if (!parsed) @@ -300,14 +300,14 @@ icon_loaded (GObject *object, if ([[NSScreen mainScreen] respondsToSelector:@selector(backingScaleFactor)]) scale = roundf ([[NSScreen mainScreen] backingScaleFactor]); #endif - info = gtk_icon_theme_lookup_by_gicon (theme, icon, ICON_SIZE, scale, GTK_ICON_LOOKUP_USE_BUILTIN); + icon = gtk_icon_theme_lookup_by_gicon (theme, icon, ICON_SIZE, scale, GTK_ICON_LOOKUP_USE_BUILTIN); - if (info != NULL) + if (icon != NULL) { cancellable = g_cancellable_new (); - gtk_icon_load_symbolic_async (info, &foreground, &success, &warning, &error, + gtk_icon_load_symbolic_async (icon, &foreground, &success, &warning, &error, cancellable, icon_loaded, self); - g_object_unref (info); + g_object_unref (icon); return; } } |