Attachment 137928 Details for Bug 183691 – file.diff

[patch] file.diff

file.diff (text/plain), 4.76 KB, created by Alexander Janus on 2013-11-05 18:20:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alexander Janus

Created: 2013-11-05 18:20:02 UTC

Size: 4.76 KB

patch

obsolete

>--- app/brush.c.orig	2013-11-05 10:57:08.000000000 +0300
>+++ app/brush.c	2013-11-05 10:58:06.000000000 +0300
>@@ -102,7 +102,7 @@
> 
> GtkType gimp_brush_get_type(void)
> {
>-  static GtkType type;
>+  static GtkType type = 0;
>   if(!type){
> #if GTK_MAJOR_VERSION > 1
>       static const GTypeInfo info =
>--- app/brushgenerated.h.orig	2013-11-05 11:11:01.000000000 +0300
>+++ app/brushgenerated.h	2013-11-05 11:11:39.000000000 +0300
>@@ -51,7 +51,7 @@
> #define GIMP_BRUSH_GENERATED(obj)  (GIMP_CHECK_CAST ((obj), GIMP_TYPE_BRUSH_GENERATED, GimpBrushGenerated))
> #define GIMP_IS_BRUSH_GENERATED(obj) (GIMP_CHECK_TYPE ((obj), GIMP_TYPE_BRUSH_GENERATED))
> 
>-guint gimp_brush_generated_get_type (void);
>+GtkType gimp_brush_generated_get_type (void);
> 
> /* normal stuff */
> 
>--- app/channel.h.orig	2013-11-05 11:20:03.000000000 +0300
>+++ app/channel.h	2013-11-05 11:20:52.000000000 +0300
>@@ -39,7 +39,7 @@
> #define GIMP_CHANNEL_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, gimp_channel_get_type(), GimpChannelClass)
> #define GIMP_IS_CHANNEL(obj)     GTK_CHECK_TYPE (obj, gimp_channel_get_type())
> 
>-guint gimp_channel_get_type (void);
>+GtkType gimp_channel_get_type (void);
> 
> /*  Special undo type  */
> typedef struct ChannelUndo ChannelUndo;
>--- app/depth/brushgenerated.c.orig	2013-11-05 11:32:19.000000000 +0300
>+++ app/depth/brushgenerated.c	2013-11-05 11:34:56.000000000 +0300
>@@ -106,9 +106,9 @@
>   brush->freeze        = 0;
> }
> 
>-guint gimp_brush_generated_get_type(void)
>+GtkType gimp_brush_generated_get_type(void)
> {
>-  static GtkType type;
>+  static GtkType type = 0;
>   if(!type){
>     GtkTypeInfo info={
>       "GimpBrushGenerated",
>--- app/depth/channel.c.orig	2013-11-05 11:22:13.000000000 +0300
>+++ app/depth/channel.c	2013-11-05 11:27:06.000000000 +0300
>@@ -51,10 +51,9 @@
> static GimpDrawableClass *parent_class = NULL;
> 
> 
>-guint
>-gimp_channel_get_type ()
>+GtkType gimp_channel_get_type ()
> {
>-  static guint channel_type = 0;
>+  static GtkType channel_type = 0;
> 
>   if (!channel_type)
>     {
>--- app/depth/layer.c.orig	2013-11-05 11:28:32.000000000 +0300
>+++ app/depth/layer.c	2013-11-05 11:30:50.000000000 +0300
>@@ -65,10 +65,10 @@
> static CanvasDrawableClass *layer_parent_class = NULL;
> static GimpChannelClass *layer_mask_parent_class = NULL;
> 
>-guint
>+GtkType 
> gimp_layer_get_type ()
> {
>-  static guint layer_type = 0;
>+  static GtkType layer_type = 0;
> 
>   if (!layer_type)
>     {
>@@ -118,10 +118,10 @@
> {
> }
> 
>-guint
>+GtkType
> gimp_layer_mask_get_type ()
> {
>-  static guint layer_mask_type = 0;
>+  static GtkType layer_mask_type = 0;
> 
>   if (!layer_mask_type)
>     {
>--- app/drawable.c.orig	2013-11-05 11:07:48.000000000 +0300
>+++ app/drawable.c	2013-11-05 11:09:02.000000000 +0300
>@@ -56,10 +56,10 @@
> 
> static CanvasDrawableClass *parent_class = NULL;
> 
>-guint
>+GtkType
> gimp_drawable_get_type ()
> {
>-  static guint drawable_type = 0;
>+  static GtkType drawable_type = 0;
> 
>   if (!drawable_type)
>     {
>--- app/drawable.h.orig	2013-11-05 11:07:39.000000000 +0300
>+++ app/drawable.h	2013-11-05 11:08:18.000000000 +0300
>@@ -32,7 +32,7 @@
> #define GIMP_DRAWABLE_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, GIMP_TYPE_DRAWABLE, GimpDrawableClass)
> #define GIMP_IS_DRAWABLE(obj)      GTK_CHECK_TYPE (obj, GIMP_TYPE_DRAWABLE)
> 
>-guint gimp_drawable_get_type (void);
>+GtkType gimp_drawable_get_type (void);
> 
> 
> /*  drawable access functions  */
>--- app/layer.h.orig	2013-11-05 10:49:42.000000000 +0300
>+++ app/layer.h	2013-11-05 10:51:01.000000000 +0300
>@@ -51,8 +51,8 @@
> #define GIMP_IS_LAYER_MASK(obj)      GTK_CHECK_TYPE (obj, gimp_layer_mask_get_type())
> 
> 
>-guint gimp_layer_get_type (void);
>-guint gimp_layer_mask_get_type (void);
>+GtkType gimp_layer_get_type (void);
>+GtkType gimp_layer_mask_get_type (void);
> 
> /*  Special undo types  */
> 
>--- lib/chainbutton.c.orig	2013-11-05 15:35:41.000000000 +0300
>+++ lib/chainbutton.c	2013-11-05 15:36:17.000000000 +0300
>@@ -155,7 +155,7 @@
> GtkType
> gimp_chain_button_get_type (void)
> {
>-  static guint gcb_type = 0;
>+  static GtkType gcb_type = 0;
> 
>   if (!gcb_type)
>     {
>--- lib/pixmap.c.orig	2013-11-05 15:33:26.000000000 +0300
>+++ lib/pixmap.c	2013-11-05 15:34:10.000000000 +0300
>@@ -70,7 +70,7 @@
> GtkType
> gimp_pixmap_get_type (void)
> {
>-  static guint pixmap_type = 0;
>+  static GtkType pixmap_type = 0;
> 
>   if (!pixmap_type)
>     {
>--- lib/size_entry.c.orig	2013-11-05 15:38:06.000000000 +0300
>+++ lib/size_entry.c	2013-11-05 15:39:14.000000000 +0300
>@@ -169,7 +169,7 @@
> GtkType
> gimp_size_entry_get_type (void)
> {
>-  static guint gse_type = 0;
>+  static GtkType gse_type = 0;
> 
>   if (!gse_type)
>     {
>--- plug-ins/script-fu/gimpcolorbutton.c.orig	2013-11-05 15:42:43.000000000 +0300
>+++ plug-ins/script-fu/gimpcolorbutton.c	2013-11-05 15:43:31.000000000 +0300
>@@ -223,7 +223,7 @@
> GtkType
> gimp_color_button_get_type (void)
> {
>-  static guint type = 0;
>+  static GtkType type = 0;
> 
>   if (!type)
>     {

Actions: View | Diff

Attachments on bug 183691: 137928