[goffice] GOComboColor: fix type mismatch in signal emission.



commit 348477810b0fa7d84c8d0a480667dcbb7e5a186c
Author: Morten Welinder <terra gnome org>
Date:   Wed Mar 20 18:38:53 2013 -0400

    GOComboColor: fix type mismatch in signal emission.
    
    G_TYPE_POINTER should be G_TYPE_INT32 which doesn't exist and so
    becomes G_TYPE_INT.  This matches what GOColorPalette does and
    hence probably works fine across all archs.

 ChangeLog                    |    5 +++++
 NEWS                         |    1 +
 goffice/gtk/go-combo-color.c |    2 +-
 3 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 3f0cdc7..308ba9f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-20  Morten Welinder  <terra gnome org>
+
+       * goffice/gtk/go-combo-color.c (go_combo_color_class_init): Fix
+       type of first argument of color_changed signal.  Fixes #696022.
+
 2013-03-20  Jean Brefort  <jean brefort normalesup org>
 
        * goffice/canvas/goc-ellipse.c (goc_ellipse_prepare_draw),
diff --git a/NEWS b/NEWS
index d3b22f0..1b25abb 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,7 @@ Morten:
        * Widget cleanups.
        * Add dialog version of the font selector.
        * Rewrite font selector.  [#695031]
+       * Fix GOComboColor signal problem.  [#696022]
 
 --------------------------------------------------------------------------
 goffice 0.10.1:
diff --git a/goffice/gtk/go-combo-color.c b/goffice/gtk/go-combo-color.c
index d386689..8632c02 100644
--- a/goffice/gtk/go-combo-color.c
+++ b/goffice/gtk/go-combo-color.c
@@ -183,7 +183,7 @@ go_combo_color_class_init (GObjectClass *gobject_class)
                              G_STRUCT_OFFSET (GOComboColorClass, color_changed),
                              NULL, NULL,
                              go__VOID__INT_BOOLEAN_BOOLEAN_BOOLEAN,
-                             G_TYPE_NONE, 4, G_TYPE_POINTER,
+                             G_TYPE_NONE, 4, G_TYPE_INT,
                              G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN);
        go_combo_color_signals [DISPLAY_CUSTOM_DIALOG] =
                g_signal_new ("display-custom-dialog",


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]