diff options
| author | Michael Natterer <mitch@imendio.com> | 2008-10-15 15:50:51 +0000 |
|---|---|---|
| committer | Michael Natterer <mitch@src.gnome.org> | 2008-10-15 15:50:51 +0000 |
| commit | ece6aa91b302cc74809a5f03470bf383b6c61167 (patch) | |
| tree | ea9a21fc29bf15fea5b119265d3eb3150f88e9f2 | |
| parent | 651bfec50b439fadb6aea137afa0eba222cb3143 (diff) | |
| download | gdk-pixbuf-ece6aa91b302cc74809a5f03470bf383b6c61167.tar.gz | |
Merged from trunk:
2008-10-15 Michael Natterer <mitch@imendio.com>
Merged from trunk:
* gdk/gdkapplaunchcontext.h (GDK_IS_APP_LAUNCH_CONTEXT): fix typo
in the type name so the macro becomes usable.
svn path=/branches/gtk-2-14/; revision=21659
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | gdk/gdkapplaunchcontext.h | 2 |
2 files changed, 8 insertions, 1 deletions
@@ -1,3 +1,10 @@ +2008-10-15 Michael Natterer <mitch@imendio.com> + + Merged from trunk: + + * gdk/gdkapplaunchcontext.h (GDK_IS_APP_LAUNCH_CONTEXT): fix typo + in the type name so the macro becomes usable. + 2008-10-13 Matthias Clasen <mclasen@redhat.com> Merged from trunk: diff --git a/gdk/gdkapplaunchcontext.h b/gdk/gdkapplaunchcontext.h index 95de92be3..cb53025c4 100644 --- a/gdk/gdkapplaunchcontext.h +++ b/gdk/gdkapplaunchcontext.h @@ -35,7 +35,7 @@ G_BEGIN_DECLS #define GDK_TYPE_APP_LAUNCH_CONTEXT (gdk_app_launch_context_get_type ()) #define GDK_APP_LAUNCH_CONTEXT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GDK_TYPE_APP_LAUNCH_CONTEXT, GdkAppLaunchContext)) #define GDK_APP_LAUNCH_CONTEXT_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GDK_TYPE_APP_LAUNCH_CONTEXT, GdkAppLaunchContextClass)) -#define GDK_IS_APP_LAUNCH_CONTEXT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GDGDK_TYPE_APP_LAUNCH_CONTEXT)) +#define GDK_IS_APP_LAUNCH_CONTEXT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GDK_TYPE_APP_LAUNCH_CONTEXT)) #define GDK_IS_APP_LAUNCH_CONTEXT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GDK_TYPE_APP_LAUNCH_CONTEXT)) #define GDK_APP_LAUNCH_CONTEXT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GDK_TYPE_APP_LAUNCH_CONTEXT, GdkAppLaunchContextClass)) |