[gtksourceview/wip/completion-item: 2/3] CompletionItem: consistent order

[Sébastien Wilmet <swilmet src gnome org>]

commit d25663bcd522f3644581ab09055e84d52607b339
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Thu Oct 20 06:55:41 2016 +0200

    CompletionItem: consistent order
    
    Same order everywhere, to know more easily if we have forgotten
    something.

 gtksourceview/gtksourcecompletionitem.c |   65 ++++++++++++++++---------------
 1 files changed, 33 insertions(+), 32 deletions(-)
---
diff --git a/gtksourceview/gtksourcecompletionitem.c b/gtksourceview/gtksourcecompletionitem.c
index 4a8d79a..c7bf3df 100644
--- a/gtksourceview/gtksourcecompletionitem.c
+++ b/gtksourceview/gtksourcecompletionitem.c
@@ -53,10 +53,10 @@ enum
        PROP_LABEL,
        PROP_MARKUP,
        PROP_TEXT,
-       PROP_ICON,
+       PROP_INFO,
        PROP_ICON_NAME,
-       PROP_GICON,
-       PROP_INFO
+       PROP_ICON,
+       PROP_GICON
 };
 
 static void gtk_source_completion_proposal_iface_init (gpointer g_iface, gpointer iface_data);
@@ -181,14 +181,14 @@ gtk_source_completion_item_get_property (GObject    *object,
                        g_value_set_string (value, item->priv->info);
                        break;
 
-               case PROP_ICON:
-                       g_value_set_object (value, item->priv->icon);
-                       break;
-
                case PROP_ICON_NAME:
                        g_value_set_string (value, item->priv->icon_name);
                        break;
 
+               case PROP_ICON:
+                       g_value_set_object (value, item->priv->icon);
+                       break;
+
                case PROP_GICON:
                        g_value_set_object (value, item->priv->gicon);
                        break;
@@ -242,18 +242,18 @@ gtk_source_completion_item_set_property (GObject      *object,
                        emit_changed (item);
                        break;
 
-               case PROP_ICON:
-                       g_clear_object (&item->priv->icon);
-                       item->priv->icon = GDK_PIXBUF (g_value_dup_object (value));
-                       emit_changed (item);
-                       break;
-
                case PROP_ICON_NAME:
                        g_free (item->priv->icon_name);
                        item->priv->icon_name = g_value_dup_string (value);
                        emit_changed (item);
                        break;
 
+               case PROP_ICON:
+                       g_clear_object (&item->priv->icon);
+                       item->priv->icon = GDK_PIXBUF (g_value_dup_object (value));
+                       emit_changed (item);
+                       break;
+
                case PROP_GICON:
                        g_clear_object (&item->priv->gicon);
                        item->priv->gicon = G_ICON (g_value_dup_object (value));
@@ -319,16 +319,16 @@ gtk_source_completion_item_class_init (GtkSourceCompletionItemClass *klass)
                                                              G_PARAM_STATIC_STRINGS));
 
        /**
-        * GtkSourceCompletionItem:icon:
+        * GtkSourceCompletionItem:info:
         *
-        * The #GdkPixbuf for the icon to be shown for this proposal.
+        * Optional extra information to be shown for this proposal.
         */
        g_object_class_install_property (object_class,
-                                        PROP_ICON,
-                                        g_param_spec_object ("icon",
-                                                             "Icon",
+                                        PROP_INFO,
+                                        g_param_spec_string ("info",
+                                                             "Info",
                                                              "",
-                                                             GDK_TYPE_PIXBUF,
+                                                             NULL,
                                                              G_PARAM_READWRITE |
                                                              G_PARAM_STATIC_STRINGS));
 
@@ -349,6 +349,20 @@ gtk_source_completion_item_class_init (GtkSourceCompletionItemClass *klass)
                                                              G_PARAM_STATIC_STRINGS));
 
        /**
+        * GtkSourceCompletionItem:icon:
+        *
+        * The #GdkPixbuf for the icon to be shown for this proposal.
+        */
+       g_object_class_install_property (object_class,
+                                        PROP_ICON,
+                                        g_param_spec_object ("icon",
+                                                             "Icon",
+                                                             "",
+                                                             GDK_TYPE_PIXBUF,
+                                                             G_PARAM_READWRITE |
+                                                             G_PARAM_STATIC_STRINGS));
+
+       /**
         * GtkSourceCompletionItem:gicon:
         *
         * The #GIcon for the icon to be shown for this proposal.
@@ -363,19 +377,6 @@ gtk_source_completion_item_class_init (GtkSourceCompletionItemClass *klass)
                                                              G_TYPE_ICON,
                                                              G_PARAM_READWRITE |
                                                              G_PARAM_STATIC_STRINGS));
-       /**
-        * GtkSourceCompletionItem:info:
-        *
-        * Optional extra information to be shown for this proposal.
-        */
-       g_object_class_install_property (object_class,
-                                        PROP_INFO,
-                                        g_param_spec_string ("info",
-                                                             "Info",
-                                                             "",
-                                                             NULL,
-                                                             G_PARAM_READWRITE |
-                                                             G_PARAM_STATIC_STRINGS));
 }
 
 static void