diff options
Diffstat (limited to 'gtk/gtkiconfactory.c')
| -rw-r--r-- | gtk/gtkiconfactory.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c index 450c921f18..8155ac8953 100644 --- a/gtk/gtkiconfactory.c +++ b/gtk/gtkiconfactory.c @@ -42,7 +42,7 @@ static GSList *all_icon_factories = NULL; -struct _GtkIconFactoryPriv +struct _GtkIconFactoryPrivate { GHashTable *icons; }; @@ -122,11 +122,11 @@ G_DEFINE_TYPE_WITH_CODE (GtkIconFactory, gtk_icon_factory, G_TYPE_OBJECT, static void gtk_icon_factory_init (GtkIconFactory *factory) { - GtkIconFactoryPriv *priv; + GtkIconFactoryPrivate *priv; factory->priv = G_TYPE_INSTANCE_GET_PRIVATE (factory, GTK_TYPE_ICON_FACTORY, - GtkIconFactoryPriv); + GtkIconFactoryPrivate); priv = factory->priv; priv->icons = g_hash_table_new (g_str_hash, g_str_equal); @@ -140,7 +140,7 @@ gtk_icon_factory_class_init (GtkIconFactoryClass *klass) object_class->finalize = gtk_icon_factory_finalize; - g_type_class_add_private (klass, sizeof (GtkIconFactoryPriv)); + g_type_class_add_private (klass, sizeof (GtkIconFactoryPrivate)); } static void @@ -161,7 +161,7 @@ static void gtk_icon_factory_finalize (GObject *object) { GtkIconFactory *factory = GTK_ICON_FACTORY (object); - GtkIconFactoryPriv *priv = factory->priv; + GtkIconFactoryPrivate *priv = factory->priv; all_icon_factories = g_slist_remove (all_icon_factories, factory); @@ -219,7 +219,7 @@ gtk_icon_factory_add (GtkIconFactory *factory, const gchar *stock_id, GtkIconSet *icon_set) { - GtkIconFactoryPriv *priv = factory->priv; + GtkIconFactoryPrivate *priv = factory->priv; gpointer old_key = NULL; gpointer old_value = NULL; @@ -262,7 +262,7 @@ GtkIconSet * gtk_icon_factory_lookup (GtkIconFactory *factory, const gchar *stock_id) { - GtkIconFactoryPriv *priv; + GtkIconFactoryPrivate *priv; g_return_val_if_fail (GTK_IS_ICON_FACTORY (factory), NULL); g_return_val_if_fail (stock_id != NULL, NULL); @@ -408,7 +408,7 @@ get_default_icons (GtkIconFactory *factory) register_stock_icon (factory, GTK_STOCK_DIALOG_AUTHENTICATION, "dialog-password"); register_stock_icon (factory, GTK_STOCK_DIALOG_ERROR, "dialog-error"); - register_stock_icon (factory, GTK_STOCK_DIALOG_INFO, "dialog-info"); + register_stock_icon (factory, GTK_STOCK_DIALOG_INFO, "dialog-information"); register_stock_icon (factory, GTK_STOCK_DIALOG_QUESTION, "dialog-question"); register_stock_icon (factory, GTK_STOCK_DIALOG_WARNING, "dialog-warning"); register_stock_icon (factory, GTK_STOCK_DND, GTK_STOCK_DND); @@ -439,7 +439,7 @@ get_default_icons (GtkIconFactory *factory) register_stock_icon (factory, GTK_STOCK_HARDDISK, "drive-harddisk"); register_stock_icon (factory, GTK_STOCK_HELP, "help-contents"); register_stock_icon (factory, GTK_STOCK_HOME, "go-home"); - register_stock_icon (factory, GTK_STOCK_INFO, "dialog-info"); + register_stock_icon (factory, GTK_STOCK_INFO, "dialog-information"); register_bidi_stock_icon (factory, GTK_STOCK_JUMP_TO, "go-jump"); register_bidi_stock_icon (factory, GTK_STOCK_GOTO_LAST, "go-last"); register_bidi_stock_icon (factory, GTK_STOCK_GO_BACK, "go-previous"); @@ -453,7 +453,7 @@ get_default_icons (GtkIconFactory *factory) register_stock_icon (factory, GTK_STOCK_ORIENTATION_REVERSE_LANDSCAPE, GTK_STOCK_ORIENTATION_REVERSE_LANDSCAPE); register_stock_icon (factory, GTK_STOCK_PAGE_SETUP, GTK_STOCK_PAGE_SETUP); register_stock_icon (factory, GTK_STOCK_PASTE, "edit-paste"); - register_stock_icon (factory, GTK_STOCK_PREFERENCES, "edit-preferences"); + register_stock_icon (factory, GTK_STOCK_PREFERENCES, GTK_STOCK_PREFERENCES); register_stock_icon (factory, GTK_STOCK_PRINT, "document-print"); register_stock_icon (factory, GTK_STOCK_PRINT_ERROR, "printer-error"); register_stock_icon (factory, GTK_STOCK_PRINT_PAUSED, "printer-paused"); @@ -1462,8 +1462,8 @@ render_icon_name_pixbuf (GtkIconSource *icon_source, names[2] = NULL; info = gtk_icon_theme_choose_icon (icon_theme, - names, - pixel_size, GTK_ICON_LOOKUP_USE_BUILTIN); + (const char **) names, + pixel_size, GTK_ICON_LOOKUP_USE_BUILTIN); g_free (names[0]); if (info) { @@ -2686,7 +2686,7 @@ _gtk_icon_factory_list_ids (void) { GList *these_ids; GtkIconFactory *factory = GTK_ICON_FACTORY (tmp_list->data); - GtkIconFactoryPriv *priv = factory->priv; + GtkIconFactoryPrivate *priv = factory->priv; these_ids = g_hash_table_get_keys (priv->icons); |