[Xfce4-commits] [apps/ristretto] 02/02: Prepare for gtk3 migration: Use accessor functions instead of direct access

noreply at xfce.org noreply at xfce.org
Tue Sep 13 16:03:50 CEST 2016


This is an automated email from the git hooks/post-receive script.

f2404 pushed a commit to branch master
in repository apps/ristretto.

commit 9ca6ef33aea057d0e860b7f7cb911661ce33d410
Author: Igor <f2404 at yandex.ru>
Date:   Tue Sep 13 17:03:30 2016 +0300

    Prepare for gtk3 migration: Use accessor functions instead of direct access
---
 src/icon_bar.c           | 77 ++++++++++++++++++++++--------------------------
 src/image_viewer.c       | 51 +++++++++++++++++++-------------
 src/main_window.c        | 26 ++++++++--------
 src/preferences_dialog.c |  4 +--
 src/privacy_dialog.c     |  2 +-
 5 files changed, 83 insertions(+), 77 deletions(-)

diff --git a/src/icon_bar.c b/src/icon_bar.c
index 968236a..7f0b830 100644
--- a/src/icon_bar.c
+++ b/src/icon_bar.c
@@ -516,7 +516,7 @@ rstto_icon_bar_init (RsttoIconBar *icon_bar)
     pango_layout_set_ellipsize (icon_bar->priv->layout,
             PANGO_ELLIPSIZE_END);
 
-    GTK_WIDGET_UNSET_FLAGS (icon_bar, GTK_CAN_FOCUS);
+    gtk_widget_set_can_focus (GTK_WIDGET (icon_bar), FALSE);
 
     rstto_icon_bar_set_adjustments (icon_bar, NULL, NULL);
 
@@ -642,10 +642,10 @@ rstto_icon_bar_style_set (
 
     (*GTK_WIDGET_CLASS (rstto_icon_bar_parent_class)->style_set) (widget, previous_style);
 
-    if (GTK_WIDGET_REALIZED (widget))
+    if (gtk_widget_get_realized (widget))
     {
         gdk_window_set_background (icon_bar->priv->bin_window,
-                &(gtk_widget_get_style (widget)->base[widget->state]));
+                &(gtk_widget_get_style (widget)->base[gtk_widget_get_state (widget)]));
     }
 }
 
@@ -661,7 +661,7 @@ rstto_icon_bar_realize (GtkWidget *widget)
     GdkWindow    *window;
     GtkStyle     *style;
 
-    GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+    gtk_widget_set_realized (widget, TRUE);
 
     gtk_widget_get_allocation (widget, &allocation);
 
@@ -701,8 +701,8 @@ rstto_icon_bar_realize (GtkWidget *widget)
 
     style = gtk_style_attach (gtk_widget_get_style (widget), window);
     gtk_widget_set_style (widget, style);
-    gdk_window_set_background (window, &(gtk_widget_get_style (widget)->base[widget->state]));
-    gdk_window_set_background (icon_bar->priv->bin_window, &(gtk_widget_get_style (widget)->base[widget->state]));
+    gdk_window_set_background (window, &(gtk_widget_get_style (widget)->base[gtk_widget_get_state (widget)]));
+    gdk_window_set_background (icon_bar->priv->bin_window, &(gtk_widget_get_style (widget)->base[gtk_widget_get_state (widget)]));
     gdk_window_show (icon_bar->priv->bin_window);
 }
 
@@ -785,7 +785,7 @@ rstto_icon_bar_size_allocate (
     if (!icon_bar->priv->active_item)
         g_warning ("thumbnail bar shown when no images are available");
 
-    if (GTK_WIDGET_REALIZED (widget))
+    if (gtk_widget_get_realized (widget))
     {
         gdk_window_move_resize (gtk_widget_get_window (widget),
                 allocation->x,
@@ -800,32 +800,32 @@ rstto_icon_bar_size_allocate (
     if (icon_bar->priv->orientation == GTK_ORIENTATION_VERTICAL)
     {
         value = gtk_adjustment_get_value (icon_bar->priv->vadjustment);
-        value = value / icon_bar->priv->vadjustment->upper * MAX (allocation->height, icon_bar->priv->height);
+        value /= gtk_adjustment_get_upper (icon_bar->priv->vadjustment) * MAX (allocation->height, icon_bar->priv->height);
     }
     else
     {
         value = gtk_adjustment_get_value (icon_bar->priv->hadjustment);
-        value = value / icon_bar->priv->hadjustment->upper * MAX (allocation->width, icon_bar->priv->width);
+        value /= gtk_adjustment_get_upper (icon_bar->priv->hadjustment) * MAX (allocation->width, icon_bar->priv->width);
     }
 
-    icon_bar->priv->hadjustment->page_size = allocation->width;
-    icon_bar->priv->hadjustment->page_increment = allocation->width * 0.9;
-    icon_bar->priv->hadjustment->step_increment = allocation->width * 0.1;
-    icon_bar->priv->hadjustment->lower = 0;
-    icon_bar->priv->hadjustment->upper = MAX (allocation->width, icon_bar->priv->width);
+    gtk_adjustment_set_page_size (icon_bar->priv->hadjustment, allocation->width);
+    gtk_adjustment_set_page_increment (icon_bar->priv->hadjustment, allocation->width * 0.9);
+    gtk_adjustment_set_step_increment (icon_bar->priv->hadjustment, allocation->width * 0.1);
+    gtk_adjustment_set_lower (icon_bar->priv->hadjustment, 0);
+    gtk_adjustment_set_upper (icon_bar->priv->hadjustment, MAX (allocation->width, icon_bar->priv->width));
 
-    icon_bar->priv->vadjustment->page_size = allocation->height;
-    icon_bar->priv->vadjustment->page_increment = allocation->height * 0.9;
-    icon_bar->priv->vadjustment->step_increment = allocation->height * 0.1;
-    icon_bar->priv->vadjustment->lower = 0;
-    icon_bar->priv->vadjustment->upper = MAX (allocation->height, icon_bar->priv->height);
+    gtk_adjustment_set_page_size (icon_bar->priv->vadjustment, allocation->height);
+    gtk_adjustment_set_page_increment (icon_bar->priv->vadjustment, allocation->height * 0.9);
+    gtk_adjustment_set_step_increment (icon_bar->priv->vadjustment, allocation->height * 0.1);
+    gtk_adjustment_set_lower (icon_bar->priv->vadjustment, 0);
+    gtk_adjustment_set_upper (icon_bar->priv->vadjustment, MAX (allocation->height, icon_bar->priv->height));
 
 
     if (icon_bar->priv->orientation == GTK_ORIENTATION_VERTICAL)
     {
         icon_bar->priv->width = allocation->width;
         icon_bar->priv->item_width = icon_bar->priv->width;
-        icon_bar->priv->hadjustment->value = 0;
+        gtk_adjustment_set_value (icon_bar->priv->hadjustment, 0);
 
         page_size = gtk_adjustment_get_page_size (icon_bar->priv->vadjustment);
 
@@ -833,13 +833,10 @@ rstto_icon_bar_size_allocate (
         if (icon_bar->priv->auto_center == TRUE)
         {
             if (icon_bar->priv->active_item)
-            {
                 value = icon_bar->priv->active_item->index * icon_bar->priv->item_height;// - ((page_size-icon_bar->priv->item_height)/2);
-            }
-		
 
-            if (value > (gtk_adjustment_get_upper (icon_bar->priv->vadjustment)-page_size))
-                value = (gtk_adjustment_get_upper (icon_bar->priv->vadjustment)-page_size);
+            if (value > (gtk_adjustment_get_upper (icon_bar->priv->vadjustment) - page_size))
+                value = (gtk_adjustment_get_upper (icon_bar->priv->vadjustment) - page_size);
 
             gtk_adjustment_set_value (icon_bar->priv->vadjustment, value);
             rstto_icon_bar_adjustment_changed (icon_bar, icon_bar->priv->vadjustment);
@@ -847,10 +844,9 @@ rstto_icon_bar_size_allocate (
         }
         else
         {
-            if (value > (gtk_adjustment_get_upper (icon_bar->priv->vadjustment)-page_size))
-            {
-                value = gtk_adjustment_get_upper (icon_bar->priv->vadjustment)-page_size;
-            }
+            if (value > (gtk_adjustment_get_upper (icon_bar->priv->vadjustment) - page_size))
+                value = gtk_adjustment_get_upper (icon_bar->priv->vadjustment) - page_size;
+
             gtk_adjustment_set_value (icon_bar->priv->vadjustment, value);
             rstto_icon_bar_adjustment_changed (icon_bar, icon_bar->priv->vadjustment);
             rstto_icon_bar_adjustment_changed (icon_bar, icon_bar->priv->hadjustment);
@@ -860,7 +856,7 @@ rstto_icon_bar_size_allocate (
     {
         icon_bar->priv->height = allocation->height;
         icon_bar->priv->item_height = icon_bar->priv->height;
-        icon_bar->priv->vadjustment->value = 0;
+        gtk_adjustment_set_value (icon_bar->priv->vadjustment, 0);
 
         page_size = gtk_adjustment_get_page_size (icon_bar->priv->hadjustment);
 
@@ -869,8 +865,8 @@ rstto_icon_bar_size_allocate (
         {
             value = icon_bar->priv->active_item->index * icon_bar->priv->item_width - ((page_size-icon_bar->priv->item_width)/2);
 
-            if (value > (gtk_adjustment_get_upper (icon_bar->priv->hadjustment)-page_size))
-                value = (gtk_adjustment_get_upper (icon_bar->priv->hadjustment)-page_size);
+            if (value > (gtk_adjustment_get_upper (icon_bar->priv->hadjustment) - page_size))
+                value = (gtk_adjustment_get_upper (icon_bar->priv->hadjustment) - page_size);
 
             gtk_adjustment_set_value (icon_bar->priv->hadjustment, value);
             rstto_icon_bar_adjustment_changed (icon_bar, icon_bar->priv->vadjustment);
@@ -878,10 +874,9 @@ rstto_icon_bar_size_allocate (
         }
         else
         {
-            if (value > (gtk_adjustment_get_upper (icon_bar->priv->hadjustment)-page_size))
-            {
-                value = gtk_adjustment_get_upper (icon_bar->priv->hadjustment)-page_size;
-            }
+            if (value > (gtk_adjustment_get_upper (icon_bar->priv->hadjustment) - page_size))
+                value = gtk_adjustment_get_upper (icon_bar->priv->hadjustment) - page_size;
+
             gtk_adjustment_set_value (icon_bar->priv->hadjustment, value);
             rstto_icon_bar_adjustment_changed (icon_bar, icon_bar->priv->vadjustment);
             rstto_icon_bar_adjustment_changed (icon_bar, icon_bar->priv->hadjustment);
@@ -1051,7 +1046,7 @@ rstto_icon_bar_button_press (
 
     icon_bar = RSTTO_ICON_BAR (widget);
 
-    if (G_UNLIKELY (!GTK_WIDGET_HAS_FOCUS (widget)))
+    if (G_UNLIKELY (!gtk_widget_has_focus (widget)))
         gtk_widget_grab_focus (widget);
 
     if (event->button == 1 && event->type == GDK_BUTTON_PRESS)
@@ -1147,7 +1142,7 @@ cb_rstto_icon_bar_adjustment_value_changed (
         GtkAdjustment *adjustment,
         RsttoIconBar  *icon_bar)
 {
-    if (GTK_WIDGET_REALIZED (icon_bar))
+    if (gtk_widget_get_realized (GTK_WIDGET (icon_bar)))
     {
         /* Set auto_center to false, this should be the default behaviour
          * in case a user changes the value of the adjustments.
@@ -1159,8 +1154,8 @@ cb_rstto_icon_bar_adjustment_value_changed (
         icon_bar->priv->auto_center = FALSE;
 
         gdk_window_move (icon_bar->priv->bin_window,
-                - icon_bar->priv->hadjustment->value,
-                - icon_bar->priv->vadjustment->value);
+                - gtk_adjustment_get_value (icon_bar->priv->hadjustment),
+                - gtk_adjustment_get_value (icon_bar->priv->vadjustment));
 
         gdk_window_process_updates (icon_bar->priv->bin_window, TRUE);
     }
@@ -1202,7 +1197,7 @@ rstto_icon_bar_queue_draw_item (
 {
     GdkRectangle area;
 
-    if (GTK_WIDGET_REALIZED (icon_bar))
+    if (gtk_widget_get_realized (GTK_WIDGET (icon_bar)))
     {
         if (icon_bar->priv->orientation == GTK_ORIENTATION_VERTICAL)
         {
diff --git a/src/image_viewer.c b/src/image_viewer.c
index fb47f8b..63ee1d3 100644
--- a/src/image_viewer.c
+++ b/src/image_viewer.c
@@ -2402,6 +2402,7 @@ static gboolean
 rstto_motion_notify_event (GtkWidget *widget, GdkEventMotion *event)
 {
     RsttoImageViewer *viewer = RSTTO_IMAGE_VIEWER (widget);
+    GtkAdjustment *adjustment;
 
     if (event->state & GDK_BUTTON1_MASK)
     {
@@ -2413,34 +2414,44 @@ rstto_motion_notify_event (GtkWidget *widget, GdkEventMotion *event)
             case RSTTO_IMAGE_VIEWER_MOTION_STATE_MOVE:
                 if (viewer->priv->motion.x != viewer->priv->motion.current_x)
                 {
-                    gint val = viewer->hadjustment->value;
-                    viewer->hadjustment->value = viewer->priv->motion.h_val + (viewer->priv->motion.x - viewer->priv->motion.current_x);
-                    if((viewer->hadjustment->value + viewer->hadjustment->page_size) > viewer->hadjustment->upper)
+                    adjustment = viewer->hadjustment;
+                    gint val = gtk_adjustment_get_value (adjustment);
+                    gtk_adjustment_set_value (adjustment,
+                            viewer->priv->motion.h_val + (viewer->priv->motion.x - viewer->priv->motion.current_x));
+                    if ((gtk_adjustment_get_value (adjustment) + gtk_adjustment_get_page_size (adjustment)) >
+                            gtk_adjustment_get_upper (adjustment))
                     {
-                        viewer->hadjustment->value = viewer->hadjustment->upper - viewer->hadjustment->page_size;
+                        gtk_adjustment_set_value (adjustment,
+                                gtk_adjustment_get_upper (adjustment) - gtk_adjustment_get_page_size (adjustment));
                     }
-                    if((viewer->hadjustment->value) < viewer->hadjustment->lower)
+                    if (gtk_adjustment_get_value (adjustment) < gtk_adjustment_get_lower (adjustment))
                     {
-                        viewer->hadjustment->value = viewer->hadjustment->lower;
+                        gtk_adjustment_set_value (adjustment,
+                                gtk_adjustment_get_lower (adjustment));
                     }
-                    if (val != viewer->hadjustment->value)
-                        gtk_adjustment_value_changed(viewer->hadjustment);
+                    if (val != gtk_adjustment_get_value (adjustment))
+                        gtk_adjustment_value_changed (adjustment);
                 }
 
                 if (viewer->priv->motion.y != viewer->priv->motion.current_y)
                 {
-                    gint val = viewer->vadjustment->value;
-                    viewer->vadjustment->value = viewer->priv->motion.v_val + (viewer->priv->motion.y - viewer->priv->motion.current_y);
-                    if((viewer->vadjustment->value + viewer->vadjustment->page_size) > viewer->vadjustment->upper)
+                    adjustment = viewer->vadjustment;
+                    gint val = gtk_adjustment_get_value (adjustment);
+                    gtk_adjustment_set_value (adjustment,
+                            viewer->priv->motion.v_val + (viewer->priv->motion.y - viewer->priv->motion.current_y));
+                    if ((gtk_adjustment_get_value (adjustment) + gtk_adjustment_get_page_size (adjustment)) >
+                            gtk_adjustment_get_upper (adjustment))
                     {
-                        viewer->vadjustment->value = viewer->vadjustment->upper - viewer->vadjustment->page_size;
+                        gtk_adjustment_set_value (adjustment,
+                                gtk_adjustment_get_upper (adjustment) - gtk_adjustment_get_page_size (adjustment));
                     }
-                    if((viewer->vadjustment->value) < viewer->vadjustment->lower)
+                    if (gtk_adjustment_get_value (adjustment) < gtk_adjustment_get_lower (adjustment))
                     {
-                        viewer->vadjustment->value = viewer->vadjustment->lower;
+                        gtk_adjustment_set_value (adjustment,
+                                gtk_adjustment_get_lower (adjustment));
                     }
-                    if (val != viewer->vadjustment->value)
-                        gtk_adjustment_value_changed(viewer->vadjustment);
+                    if (val != gtk_adjustment_get_value (adjustment))
+                        gtk_adjustment_value_changed (adjustment);
                 }
                 break;
             case RSTTO_IMAGE_VIEWER_MOTION_STATE_BOX_ZOOM:
@@ -2491,8 +2502,8 @@ rstto_button_press_event (GtkWidget *widget, GdkEventButton *event)
         viewer->priv->motion.y = event->y;
         viewer->priv->motion.current_x = event->x;
         viewer->priv->motion.current_y = event->y;
-        viewer->priv->motion.h_val = viewer->hadjustment->value;
-        viewer->priv->motion.v_val = viewer->vadjustment->value;
+        viewer->priv->motion.h_val = gtk_adjustment_get_value (viewer->hadjustment);
+        viewer->priv->motion.v_val = gtk_adjustment_get_value (viewer->vadjustment);
 
         if (viewer->priv->file != NULL )
         {
@@ -2820,11 +2831,11 @@ cb_rstto_image_viewer_dnd (GtkWidget *widget, GdkDragContext *context, gint x, g
 {
     g_return_if_fail ( RSTTO_IS_IMAGE_VIEWER(viewer) );
 
-    if ((data->length >= 0) && (data->format == 8))
+    if ((gtk_selection_data_get_length (data) >= 0) && (gtk_selection_data_get_format (data) == 8))
     {
         gchar **uris;
 
-        uris = g_uri_list_extract_uris ((const gchar*)data->data);
+        uris = g_uri_list_extract_uris ((const gchar*) gtk_selection_data_get_data (data));
 
         g_signal_emit_by_name (viewer, "files-dnd", uris);
 
diff --git a/src/main_window.c b/src/main_window.c
index 86a7be2..71cc511 100644
--- a/src/main_window.c
+++ b/src/main_window.c
@@ -1565,7 +1565,7 @@ rstto_main_window_update_buttons (RsttoMainWindow *window)
         case 0: 
             if ( gtk_widget_get_visible (GTK_WIDGET (window)) )
             {
-                if ( 0 != (gdk_window_get_state (GTK_WIDGET (window)->window) & GDK_WINDOW_STATE_FULLSCREEN ))
+                if ( 0 != (gdk_window_get_state (gtk_widget_get_window (GTK_WIDGET (window))) & GDK_WINDOW_STATE_FULLSCREEN ))
                 {
                     gtk_widget_show (window->priv->toolbar);
                 }
@@ -1643,7 +1643,7 @@ rstto_main_window_update_buttons (RsttoMainWindow *window)
         case 1: 
             if (rstto_settings_get_boolean_property (window->priv->settings_manager, "show-thumbnailbar"))
             {
-                if ( 0 == (gdk_window_get_state (GTK_WIDGET (window)->window) & GDK_WINDOW_STATE_FULLSCREEN ))
+                if ( 0 == (gdk_window_get_state (gtk_widget_get_window (GTK_WIDGET (window))) & GDK_WINDOW_STATE_FULLSCREEN ))
                 {
                     gtk_widget_show (window->priv->t_bar_s_window);
                 }
@@ -1662,7 +1662,7 @@ rstto_main_window_update_buttons (RsttoMainWindow *window)
                 
                 }
             }
-            if ( 0 != (gdk_window_get_state (GTK_WIDGET (window)->window) & GDK_WINDOW_STATE_FULLSCREEN ))
+            if ( 0 != (gdk_window_get_state (gtk_widget_get_window (GTK_WIDGET (window))) & GDK_WINDOW_STATE_FULLSCREEN ))
             {
                 gtk_widget_hide (window->priv->toolbar);
             }
@@ -1749,7 +1749,7 @@ rstto_main_window_update_buttons (RsttoMainWindow *window)
         default: 
             if (rstto_settings_get_boolean_property (window->priv->settings_manager, "show-thumbnailbar"))
             {
-                if ( 0 == (gdk_window_get_state (GTK_WIDGET (window)->window) & GDK_WINDOW_STATE_FULLSCREEN ))
+                if ( 0 == (gdk_window_get_state (gtk_widget_get_window (GTK_WIDGET (window))) & GDK_WINDOW_STATE_FULLSCREEN ))
                 {
                     gtk_widget_show (window->priv->t_bar_s_window);
                 }
@@ -1768,7 +1768,7 @@ rstto_main_window_update_buttons (RsttoMainWindow *window)
                 
                 }
             }
-            if ( 0 != (gdk_window_get_state (GTK_WIDGET (window)->window) & GDK_WINDOW_STATE_FULLSCREEN ))
+            if ( 0 != (gdk_window_get_state (gtk_widget_get_window (GTK_WIDGET (window))) & GDK_WINDOW_STATE_FULLSCREEN ))
             {
                 gtk_widget_hide (window->priv->toolbar);
             }
@@ -1877,7 +1877,7 @@ rstto_main_window_update_buttons (RsttoMainWindow *window)
         /* Do not make the widget visible when in
          * fullscreen mode.
          */
-        if ( 0 == (gdk_window_get_state (GTK_WIDGET (window)->window) & GDK_WINDOW_STATE_FULLSCREEN ))
+        if ( 0 == (gdk_window_get_state (gtk_widget_get_window (GTK_WIDGET (window))) & GDK_WINDOW_STATE_FULLSCREEN ))
         {
             gtk_ui_manager_add_ui (window->priv->ui_manager,
                                    window->priv->toolbar_fullscreen_merge_id,
@@ -1910,7 +1910,7 @@ rstto_window_save_geometry_timer (gpointer user_data)
     if (gtk_widget_get_visible (GTK_WIDGET (window)))
     {
         /* determine the current state of the window */
-        gint state = gdk_window_get_state (GTK_WIDGET (window)->window);
+        gint state = gdk_window_get_state (gtk_widget_get_window (GTK_WIDGET (window)));
 
         /* don't save geometry for maximized or fullscreen windows */
         if ((state & (GDK_WINDOW_STATE_MAXIMIZED | GDK_WINDOW_STATE_FULLSCREEN)) == 0)
@@ -2395,9 +2395,9 @@ cb_rstto_main_window_motion_notify_event (RsttoMainWindow *window,
                                          gpointer user_data)
 {
     gint width, height;
-    if(gdk_window_get_state(GTK_WIDGET(window)->window) & GDK_WINDOW_STATE_FULLSCREEN)
+    if (gdk_window_get_state (gtk_widget_get_window (GTK_WIDGET(window))) & GDK_WINDOW_STATE_FULLSCREEN)
     {
-        gdk_drawable_get_size (GDK_DRAWABLE(GTK_WIDGET(window)->window), &width, &height);
+        gdk_drawable_get_size (GDK_DRAWABLE (gtk_widget_get_window (GTK_WIDGET (window))), &width, &height);
 
         if ((event->x_root == 0) || (event->y_root == 0) || (((gint)event->x_root) == (width-1)) || (((gint)event->y_root) == (height-1)))
         {
@@ -2455,7 +2455,7 @@ cb_rstto_main_window_image_viewer_enter_notify_event (GtkWidget *widget,
                                                       gpointer user_data)
 {
     RsttoMainWindow *window = RSTTO_MAIN_WINDOW (user_data);
-    if(gdk_window_get_state(GTK_WIDGET(window)->window) & GDK_WINDOW_STATE_FULLSCREEN)
+    if (gdk_window_get_state (gtk_widget_get_window (GTK_WIDGET(window))) & GDK_WINDOW_STATE_FULLSCREEN)
     {
         if (rstto_image_list_get_n_images (window->priv->image_list) != 0)
         {
@@ -2588,13 +2588,13 @@ cb_rstto_main_window_play_slideshow (RsttoMainWindow *window)
 static void
 cb_rstto_main_window_fullscreen (GtkWidget *widget, RsttoMainWindow *window)
 {
-    if(gdk_window_get_state(GTK_WIDGET(window)->window) & GDK_WINDOW_STATE_FULLSCREEN)
+    if (gdk_window_get_state (gtk_widget_get_window (GTK_WIDGET (window))) & GDK_WINDOW_STATE_FULLSCREEN)
     {
-        gtk_window_unfullscreen(GTK_WINDOW(window));
+        gtk_window_unfullscreen (GTK_WINDOW (window));
     }
     else
     {
-        gtk_window_fullscreen(GTK_WINDOW(window));
+        gtk_window_fullscreen (GTK_WINDOW (window));
     }
 }
 
diff --git a/src/preferences_dialog.c b/src/preferences_dialog.c
index f7f6ec4..84d9a0b 100644
--- a/src/preferences_dialog.c
+++ b/src/preferences_dialog.c
@@ -534,11 +534,11 @@ rstto_preferences_dialog_init ( RsttoPreferencesDialog *dialog )
             dialog);
     
 
-    gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), notebook);
+    gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), notebook);
     gtk_widget_show_all (notebook);
 
     /* Window should not be resizable */
-    gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
+    gtk_window_set_resizable (GTK_WINDOW(dialog), FALSE);
 
     gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CLOSE, GTK_RESPONSE_OK);
 
diff --git a/src/privacy_dialog.c b/src/privacy_dialog.c
index db2749d..47f28ca 100644
--- a/src/privacy_dialog.c
+++ b/src/privacy_dialog.c
@@ -171,7 +171,7 @@ rstto_privacy_dialog_init (RsttoPrivacyDialog *dialog)
     gtk_box_pack_start (GTK_BOX (display_main_hbox), 
                         dialog->priv->cleanup_timeframe_combo, FALSE, FALSE, 0);
 
-    gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), 
+    gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                        dialog->priv->cleanup_frame);
 
     gtk_widget_show_all (dialog->priv->cleanup_frame);

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Xfce4-commits mailing list