Make 3.0 parallel-installable to 2.x

[~andy/gtk] / gdk-pixbuf / gdk-pixbuf-csource.c

diff --git a/gdk-pixbuf/gdk-pixbuf-csource.c b/gdk-pixbuf/gdk-pixbuf-csource.c
index 4e21553d5ca1d78b84b496cbbcb56858c9dfcc6b..c9b0d4f23895240361bea42e836e18c642c62b2f 100644 (file)
--- a/gdk-pixbuf/gdk-pixbuf-csource.c
+++ b/gdk-pixbuf/gdk-pixbuf-csource.c
@@ -16,9 +16,11 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
-#include <config.h>
+#include "config.h"
 
+#define __GTK_H_INSIDE__
 #include "../gtk/gtkversion.h" /* versioning */
+#undef __GTK_H_INSIDE__
 #include "gdk-pixbuf.h"
 #include "gdk-pixdata.h"
 #include <glib/gprintf.h>
@@ -29,8 +31,8 @@
 /* --- defines --- */
 #undef G_LOG_DOMAIN
 #define        G_LOG_DOMAIN    "Gdk-Pixbuf-CSource"
-#define PRG_NAME        "gdk-pixbuf-csource"
-#define PKG_NAME        "Gtk+"
+#define PRG_NAME        "gdk-pixbuf-csource-3.0"
+#define PKG_NAME        "GTK+"
 #define PKG_HTTP_HOME   "http://www.gtk.org"
 
 
@@ -272,7 +274,7 @@ print_blurb (FILE    *bout,
   if (!print_help)
     {
       g_fprintf (bout, "%s version ", PRG_NAME);
-      g_fprintf (bout, "%u.%u.%u", GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
+      g_fprintf (bout, "%d.%d.%d", GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
       g_fprintf (bout, "\n");
       g_fprintf (bout, "%s comes with ABSOLUTELY NO WARRANTY.\n", PRG_NAME);
       g_fprintf (bout, "You may redistribute copies of %s under the terms of\n", PRG_NAME);