Commit cebfe956 authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor

A few updates for GTypePlugin.

Wed Nov 15 21:56:28 2000  Owen Taylor  <otaylor@redhat.com>

	* src/pixbuf-*: A few updates for GTypePlugin.
parent 8373550e
Wed Nov 15 21:56:28 2000 Owen Taylor <otaylor@redhat.com>
* src/pixbuf-*: A few updates for GTypePlugin.
Tue Jul 18 12:13:19 2000 Owen Taylor <otaylor@redhat.com>
Updates to work with GTK+-2.0 theme engine architecture.
......
......@@ -13,5 +13,4 @@ libpixmap_la_SOURCES = \
pixbuf-style.h \
pixbuf.h
libpixmap_la_LDFLAGS = -module -avoid-version
libpixmap_la_LIBADD = -lgdk_pixbuf
libpixmap_la_LDFLAGS = -avoid-version -module
......@@ -1069,7 +1069,7 @@ draw_handle (GtkStyle *style,
GType pixbuf_type_style = 0;
void
pixbuf_style_register_type (GtkThemeEngine *engine)
pixbuf_style_register_type (GTypeModule *module)
{
static const GTypeInfo object_info =
{
......@@ -1084,10 +1084,10 @@ pixbuf_style_register_type (GtkThemeEngine *engine)
(GInstanceInitFunc) pixbuf_style_init,
};
pixbuf_type_style = gtk_theme_engine_register_type (engine,
GTK_TYPE_STYLE,
"PixbufStyle",
&object_info);
pixbuf_type_style = g_type_module_register_type (module,
GTK_TYPE_STYLE,
"PixbufStyle",
&object_info, 0);
}
static void
......
......@@ -26,14 +26,14 @@
#include <gmodule.h>
G_MODULE_EXPORT void
theme_init(GtkThemeEngine * engine)
theme_init (GTypeModule *module)
{
pixbuf_rc_style_register_type (engine);
pixbuf_style_register_type (engine);
pixbuf_rc_style_register_type (module);
pixbuf_style_register_type (module);
}
G_MODULE_EXPORT void
theme_exit(void)
theme_exit (void)
{
}
......
......@@ -117,7 +117,7 @@ static GtkRcStyleClass *parent_class;
GType pixbuf_type_rc_style = 0;
void
pixbuf_rc_style_register_type (GtkThemeEngine *engine)
pixbuf_rc_style_register_type (GTypeModule *module)
{
static const GTypeInfo object_info =
{
......@@ -132,10 +132,10 @@ pixbuf_rc_style_register_type (GtkThemeEngine *engine)
(GInstanceInitFunc) pixbuf_rc_style_init,
};
pixbuf_type_rc_style = gtk_theme_engine_register_type (engine,
GTK_TYPE_RC_STYLE,
"PixbufRcStyle",
&object_info);
pixbuf_type_rc_style = g_type_module_register_type (module,
GTK_TYPE_RC_STYLE,
"PixbufRcStyle",
&object_info, 0);
}
static void
......
......@@ -46,4 +46,4 @@ struct _PixbufRcStyleClass
GtkRcStyleClass parent_class;
};
void pixbuf_rc_style_register_type (GtkThemeEngine *engine);
void pixbuf_rc_style_register_type (GTypeModule *module);
......@@ -212,9 +212,15 @@ theme_pixbuf_set_stretch (ThemePixbuf *theme_pb,
GdkPixbuf *
pixbuf_cache_value_new (gchar *filename)
{
GdkPixbuf *result = gdk_pixbuf_new_from_file (filename);
GError *err = NULL;
GdkPixbuf *result = gdk_pixbuf_new_from_file (filename, &err);
if (!result)
g_warning("Pixbuf theme: Cannot load pixmap file %s\n", filename);
{
g_warning ("Pixbuf theme: Cannot load pixmap file %s: %s\n",
filename, err->message);
g_error_free (err);
}
return result;
}
......
......@@ -44,6 +44,6 @@ struct _PixbufStyleClass
GtkStyleClass parent_class;
};
void pixbuf_style_register_type (GtkThemeEngine *engine);
void pixbuf_style_register_type (GTypeModule *module);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment