[evince] Fix omission from the GtkVBox to GtkBox conversion



commit 73fedee31f5aa2d629354bc4a9ec032e7661fd8c
Author: astian <astian eclipso at>
Date:   Thu Aug 3 14:27:45 2017 +0000

    Fix omission from the GtkVBox to GtkBox conversion
    
    Commits 7d6a5f17c and bd9f1a6ad (2013-06-09) that changed the users of
    GtkVbox to GtkBox neglected to change the type names in the instance and
    class structures (it changed only the GObject type IDs).
    
    Maybe this wasn't noticed before because GtkVBox is in fact derived from
    GtkBox, which means that when the GObject machinery accessed the
    structure it simply used the smaller prefix memory area corresponding to
    a GtkBox.  So this bug may have been inconsequential, but it does
    illustrate the amount of trust (read "burden") that GObject places on
    the programmer by casting types all over the place (not that it can do
    much better while staying in C).
    
    https://bugzilla.gnome.org/show_bug.cgi?id=785783

 properties/ev-properties-view.c |    4 ++--
 shell/ev-properties-fonts.c     |    4 ++--
 shell/ev-properties-license.c   |    4 ++--
 shell/ev-sidebar-annotations.h  |    4 ++--
 shell/ev-sidebar-attachments.h  |    4 ++--
 shell/ev-sidebar-bookmarks.h    |    4 ++--
 shell/ev-sidebar-layers.h       |    4 ++--
 shell/ev-sidebar-links.h        |    4 ++--
 shell/ev-sidebar-thumbnails.h   |    4 ++--
 shell/ev-sidebar.h              |    4 ++--
 10 files changed, 20 insertions(+), 20 deletions(-)
---
diff --git a/properties/ev-properties-view.c b/properties/ev-properties-view.c
index 1a6a78e..90e9d3f 100644
--- a/properties/ev-properties-view.c
+++ b/properties/ev-properties-view.c
@@ -76,7 +76,7 @@ static const PropertyInfo properties_info[] = {
 };
 
 struct _EvPropertiesView {
-       GtkVBox base_instance;
+       GtkBox base_instance;
 
        GtkWidget *grid;
        GtkWidget *labels[N_PROPERTIES];
@@ -85,7 +85,7 @@ struct _EvPropertiesView {
 };
 
 struct _EvPropertiesViewClass {
-       GtkVBoxClass base_class;
+       GtkBoxClass base_class;
 };
 
 G_DEFINE_TYPE (EvPropertiesView, ev_properties_view, GTK_TYPE_BOX)
diff --git a/shell/ev-properties-fonts.c b/shell/ev-properties-fonts.c
index 9b7cf1a..6c92167 100644
--- a/shell/ev-properties-fonts.c
+++ b/shell/ev-properties-fonts.c
@@ -31,7 +31,7 @@
 #include "ev-properties-fonts.h"
 
 struct _EvPropertiesFonts {
-       GtkVBox base_instance;
+       GtkBox base_instance;
 
        GtkWidget *fonts_treeview;
        GtkWidget *fonts_progress_label;
@@ -42,7 +42,7 @@ struct _EvPropertiesFonts {
 };
 
 struct _EvPropertiesFontsClass {
-       GtkVBoxClass base_class;
+       GtkBoxClass base_class;
 };
 
 static void
diff --git a/shell/ev-properties-license.c b/shell/ev-properties-license.c
index 411786b..e681b3d 100644
--- a/shell/ev-properties-license.c
+++ b/shell/ev-properties-license.c
@@ -29,11 +29,11 @@
 #include "ev-properties-license.h"
 
 struct _EvPropertiesLicense {
-       GtkVBox base_instance;
+       GtkBox base_instance;
 };
 
 struct _EvPropertiesLicenseClass {
-       GtkVBoxClass base_class;
+       GtkBoxClass base_class;
 };
 
 G_DEFINE_TYPE (EvPropertiesLicense, ev_properties_license, GTK_TYPE_BOX)
diff --git a/shell/ev-sidebar-annotations.h b/shell/ev-sidebar-annotations.h
index 6f9e6ae..6d0b43e 100644
--- a/shell/ev-sidebar-annotations.h
+++ b/shell/ev-sidebar-annotations.h
@@ -38,13 +38,13 @@ typedef struct _EvSidebarAnnotationsPrivate EvSidebarAnnotationsPrivate;
 #define EV_SIDEBAR_ANNOTATIONS_GET_CLASS(object) (G_TYPE_INSTANCE_GET_CLASS((object), 
EV_TYPE_SIDEBAR_ANNOTATIONS, EvSidebarAnnotationsClass))
 
 struct _EvSidebarAnnotations {
-       GtkVBox base_instance;
+       GtkBox base_instance;
 
        EvSidebarAnnotationsPrivate *priv;
 };
 
 struct _EvSidebarAnnotationsClass {
-       GtkVBoxClass base_class;
+       GtkBoxClass base_class;
 
        void    (* annot_activated)     (EvSidebarAnnotations *sidebar_annots,
                                         EvMapping            *mapping);
diff --git a/shell/ev-sidebar-attachments.h b/shell/ev-sidebar-attachments.h
index 8e42da4..b7ed9b0 100644
--- a/shell/ev-sidebar-attachments.h
+++ b/shell/ev-sidebar-attachments.h
@@ -41,13 +41,13 @@ typedef struct _EvSidebarAttachmentsPrivate EvSidebarAttachmentsPrivate;
 #define EV_SIDEBAR_ATTACHMENTS_GET_CLASS(object) (G_TYPE_INSTANCE_GET_CLASS((object), 
EV_TYPE_SIDEBAR_ATTACHMENTS, EvSidebarAttachmentsClass))
 
 struct _EvSidebarAttachments {
-       GtkVBox base_instance;
+       GtkBox base_instance;
 
        EvSidebarAttachmentsPrivate *priv;
 };
 
 struct _EvSidebarAttachmentsClass {
-       GtkVBoxClass base_class;
+       GtkBoxClass base_class;
 
        /* Signals */
        void (*popup_menu) (EvSidebarAttachments *ev_attachbar,
diff --git a/shell/ev-sidebar-bookmarks.h b/shell/ev-sidebar-bookmarks.h
index c163361..c2438b0 100644
--- a/shell/ev-sidebar-bookmarks.h
+++ b/shell/ev-sidebar-bookmarks.h
@@ -40,13 +40,13 @@ typedef struct _EvSidebarBookmarksPrivate EvSidebarBookmarksPrivate;
 #define EV_SIDEBAR_BOOKMARKS_GET_CLASS(object) (G_TYPE_INSTANCE_GET_CLASS((object), 
EV_TYPE_SIDEBAR_BOOKMARKS, EvSidebarBookmarksClass))
 
 struct _EvSidebarBookmarks {
-       GtkVBox base_instance;
+       GtkBox base_instance;
 
        EvSidebarBookmarksPrivate *priv;
 };
 
 struct _EvSidebarBookmarksClass {
-       GtkVBoxClass base_class;
+       GtkBoxClass base_class;
 
         void (*add_bookmark) (EvSidebarBookmarks *sidebar_bookmarks);
 };
diff --git a/shell/ev-sidebar-layers.h b/shell/ev-sidebar-layers.h
index 0dd99df..a610b80 100644
--- a/shell/ev-sidebar-layers.h
+++ b/shell/ev-sidebar-layers.h
@@ -38,13 +38,13 @@ typedef struct _EvSidebarLayersPrivate EvSidebarLayersPrivate;
 #define EV_SIDEBAR_LAYERS_GET_CLASS(object) (G_TYPE_INSTANCE_GET_CLASS((object), EV_TYPE_SIDEBAR_LAYERS, 
EvSidebarLayersClass))
 
 struct _EvSidebarLayers {
-       GtkVBox base_instance;
+       GtkBox base_instance;
 
        EvSidebarLayersPrivate *priv;
 };
 
 struct _EvSidebarLayersClass {
-       GtkVBoxClass base_class;
+       GtkBoxClass base_class;
 
        /* Signals */
        void (* layers_visibility_changed) (EvSidebarLayers *ev_layers);
diff --git a/shell/ev-sidebar-links.h b/shell/ev-sidebar-links.h
index eed416d..12da4d1 100644
--- a/shell/ev-sidebar-links.h
+++ b/shell/ev-sidebar-links.h
@@ -44,13 +44,13 @@ typedef struct _EvSidebarLinksPrivate EvSidebarLinksPrivate;
 #define EV_SIDEBAR_LINKS_GET_CLASS(object) (G_TYPE_INSTANCE_GET_CLASS((object), EV_TYPE_SIDEBAR_LINKS, 
EvSidebarLinksClass))
 
 struct _EvSidebarLinks {
-       GtkVBox base_instance;
+       GtkBox base_instance;
 
        EvSidebarLinksPrivate *priv;
 };
 
 struct _EvSidebarLinksClass {
-       GtkVBoxClass base_class;
+       GtkBoxClass base_class;
 
        void    (* link_activated) (EvSidebarLinks *sidebar_links,
                                    EvLink         *link);
diff --git a/shell/ev-sidebar-thumbnails.h b/shell/ev-sidebar-thumbnails.h
index be04156..b989a3b 100644
--- a/shell/ev-sidebar-thumbnails.h
+++ b/shell/ev-sidebar-thumbnails.h
@@ -40,13 +40,13 @@ typedef struct _EvSidebarThumbnailsPrivate EvSidebarThumbnailsPrivate;
 #define EV_SIDEBAR_THUMBNAILS_GET_CLASS(object)        (G_TYPE_INSTANCE_GET_CLASS((object), 
EV_TYPE_SIDEBAR_THUMBNAILS, EvSidebarThumbnailsClass))
 
 struct _EvSidebarThumbnails {
-       GtkVBox base_instance;
+       GtkBox base_instance;
 
        EvSidebarThumbnailsPrivate *priv;
 };
 
 struct _EvSidebarThumbnailsClass {
-       GtkVBoxClass base_class;
+       GtkBoxClass base_class;
 };
 
 GType      ev_sidebar_thumbnails_get_type     (void) G_GNUC_CONST;
diff --git a/shell/ev-sidebar.h b/shell/ev-sidebar.h
index 1c8fed2..5cee4fd 100644
--- a/shell/ev-sidebar.h
+++ b/shell/ev-sidebar.h
@@ -42,13 +42,13 @@ typedef struct _EvSidebarPrivate EvSidebarPrivate;
 #define EV_SIDEBAR_GET_CLASS(object) (G_TYPE_INSTANCE_GET_CLASS((object), EV_TYPE_SIDEBAR, EvSidebarClass))
 
 struct _EvSidebar {
-       GtkVBox base_instance;
+       GtkBox base_instance;
 
        EvSidebarPrivate *priv;
 };
 
 struct _EvSidebarClass {
-       GtkVBoxClass base_class;
+       GtkBoxClass base_class;
 };
 
 GType      ev_sidebar_get_type  (void) G_GNUC_CONST;


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