AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

A few updates for GTypePlugin.

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

	* src/pixbuf-*: A few updates for GTypePlugin.
This commit is contained in:
Owen Taylor 2001-02-01 23:55:43 +00:00 committed by Owen Taylor
parent 8373550e8c
commit cebfe95660
8 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/engines/pixbuf/ChangeLog
View File

@ -1,3 +1,7 @@
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> Tue Jul 18 12:13:19 2000 Owen Taylor <otaylor@redhat.com>
Updates to work with GTK+-2.0 theme engine architecture. Updates to work with GTK+-2.0 theme engine architecture.

3
modules/engines/pixbuf/Makefile.am
View File

@ -13,5 +13,4 @@ libpixmap_la_SOURCES = \
pixbuf-style.h \ pixbuf-style.h \
pixbuf.h pixbuf.h
libpixmap_la_LDFLAGS = -module -avoid-version libpixmap_la_LDFLAGS = -avoid-version -module
libpixmap_la_LIBADD = -lgdk_pixbuf

10
modules/engines/pixbuf/pixbuf-draw.c
View File

@ -1069,7 +1069,7 @@ draw_handle (GtkStyle *style,
GType pixbuf_type_style = 0; GType pixbuf_type_style = 0;
void void
pixbuf_style_register_type (GtkThemeEngine *engine) pixbuf_style_register_type (GTypeModule *module)
{ {
static const GTypeInfo object_info = static const GTypeInfo object_info =
{ {
@ -1084,10 +1084,10 @@ pixbuf_style_register_type (GtkThemeEngine *engine)
(GInstanceInitFunc) pixbuf_style_init, (GInstanceInitFunc) pixbuf_style_init,
}; };
pixbuf_type_style = gtk_theme_engine_register_type (engine, pixbuf_type_style = g_type_module_register_type (module,
GTK_TYPE_STYLE, GTK_TYPE_STYLE,
"PixbufStyle", "PixbufStyle",
&object_info); &object_info, 0);
} }
static void static void

8
modules/engines/pixbuf/pixbuf-main.c
View File

@ -26,14 +26,14 @@
#include <gmodule.h> #include <gmodule.h>
G_MODULE_EXPORT void G_MODULE_EXPORT void
theme_init(GtkThemeEngine * engine) theme_init (GTypeModule *module)
{ {
pixbuf_rc_style_register_type (engine); pixbuf_rc_style_register_type (module);
pixbuf_style_register_type (engine); pixbuf_style_register_type (module);
} }
G_MODULE_EXPORT void G_MODULE_EXPORT void
theme_exit(void) theme_exit (void)
{ {
} }

10
modules/engines/pixbuf/pixbuf-rc-style.c
View File

@ -117,7 +117,7 @@ static GtkRcStyleClass *parent_class;
GType pixbuf_type_rc_style = 0; GType pixbuf_type_rc_style = 0;
void void
pixbuf_rc_style_register_type (GtkThemeEngine *engine) pixbuf_rc_style_register_type (GTypeModule *module)
{ {
static const GTypeInfo object_info = static const GTypeInfo object_info =
{ {
@ -132,10 +132,10 @@ pixbuf_rc_style_register_type (GtkThemeEngine *engine)
(GInstanceInitFunc) pixbuf_rc_style_init, (GInstanceInitFunc) pixbuf_rc_style_init,
}; };
pixbuf_type_rc_style = gtk_theme_engine_register_type (engine, pixbuf_type_rc_style = g_type_module_register_type (module,
GTK_TYPE_RC_STYLE, GTK_TYPE_RC_STYLE,
"PixbufRcStyle", "PixbufRcStyle",
&object_info); &object_info, 0);
} }
static void static void

2
modules/engines/pixbuf/pixbuf-rc-style.h
View File

@ -46,4 +46,4 @@ struct _PixbufRcStyleClass
GtkRcStyleClass parent_class; GtkRcStyleClass parent_class;
}; };
void pixbuf_rc_style_register_type (GtkThemeEngine *engine); void pixbuf_rc_style_register_type (GTypeModule *module);

10
modules/engines/pixbuf/pixbuf-render.c
View File

@ -212,9 +212,15 @@ theme_pixbuf_set_stretch (ThemePixbuf *theme_pb,
GdkPixbuf * GdkPixbuf *
pixbuf_cache_value_new (gchar *filename) 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) 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; return result;
} }

2
modules/engines/pixbuf/pixbuf-style.h
View File

@ -44,6 +44,6 @@ struct _PixbufStyleClass
GtkStyleClass parent_class; GtkStyleClass parent_class;
}; };
void pixbuf_style_register_type (GtkThemeEngine *engine); void pixbuf_style_register_type (GTypeModule *module);