GNOME.org
 

[cheese] Use accessor functions instead direct access, fixes bug #585210

commit 42656fb9c758f1a1891ace9b08187746e920c08f
Author: Javier Jardón <javierjc1982 gmail com>
Date:   Mon Jun 22 02:36:22 2009 +0200

    Use accessor functions instead direct access, fixes bug #585210

 src/cheese-countdown.c      |    7 +++--
 src/cheese-effect-chooser.c |    6 ++--
 src/cheese-flash.c          |    4 +-
 src/cheese-thumb-view.c     |    4 +-
 src/cheese-webcam.c         |    3 +-
 src/cheese-window.c         |    8 +++---
 src/eog-thumb-nav.c         |   50 ++++++++++++++++++++++++++++++++----------
 src/ephy-spinner.c          |    4 +-
 src/gedit-message-area.c    |    4 +-
 9 files changed, 59 insertions(+), 31 deletions(-)
---
diff --git a/src/cheese-countdown.c b/src/cheese-countdown.c
index e4e2dca..810ed4f 100644
--- a/src/cheese-countdown.c
+++ b/src/cheese-countdown.c
@@ -380,7 +380,7 @@ on_expose (GtkWidget *widget, GdkEventExpose *pEvent, gpointer data)
   color_shade (&priv->bg, 1.08f, &bgShade4);
 
   /* create cairo context */
-  pContext = gdk_cairo_create (widget->window);
+  pContext = gdk_cairo_create (gtk_widget_get_window (widget));
   cairo_set_line_width (pContext, 1.0f);
 
   /* clear drawing-context */
@@ -565,9 +565,10 @@ static void
 on_style_set_cb (GtkWidget *widget, GtkStyle *previous_style, gpointer data)
 {
   CheeseCountdownPrivate *priv = CHEESE_COUNTDOWN_GET_PRIVATE (data);
+  GtkStyle *style = gtk_widget_get_style (GTK_WIDGET (widget));
 
-  GdkColor *color_bg   = &GTK_WIDGET (widget)->style->bg[GTK_STATE_SELECTED];
-  GdkColor *color_text = &GTK_WIDGET (widget)->style->fg[GTK_STATE_SELECTED];
+  GdkColor *color_bg   = &style->bg[GTK_STATE_SELECTED];
+  GdkColor *color_text = &style->fg[GTK_STATE_SELECTED];
 
   priv->bg.r   = ((double) color_bg->red) / 65535;
   priv->bg.g   = ((double) color_bg->green) / 65535;
diff --git a/src/cheese-effect-chooser.c b/src/cheese-effect-chooser.c
index 58cc928..41e816d 100644
--- a/src/cheese-effect-chooser.c
+++ b/src/cheese-effect-chooser.c
@@ -212,7 +212,7 @@ cheese_effect_chooser_expose_cb (GtkWidget *widget, GdkEventExpose *expose_event
   width  = widget->allocation.width;
   height = widget->allocation.height;
 
-  cr = gdk_cairo_create (widget->window);
+  cr = gdk_cairo_create (gtk_widget_get_window (widget));
 
   cairo_save (cr);
   cairo_scale (cr, width, height);
@@ -236,8 +236,8 @@ cheese_effect_chooser_button_press_event_cb (GtkWidget *widget, GdkEventButton *
   CheeseEffectChooserPrivate *priv = CHEESE_EFFECT_CHOOSER_GET_PRIVATE (widget);
 
   int i;
-  int col  = (int) (button_event->x / widget->allocation.width * BOARD_COLS);
-  int row  = (int) (button_event->y / widget->allocation.height * BOARD_ROWS);
+  int col = (int) (button_event->x / widget->allocation.width * BOARD_COLS);
+  int row = (int) (button_event->y / widget->allocation.height * BOARD_ROWS);
   int slot = (row * BOARD_COLS + col);
 
   priv->selected[slot] = !priv->selected[slot];
diff --git a/src/cheese-flash.c b/src/cheese-flash.c
index 76ae42b..38ec0c1 100644
--- a/src/cheese-flash.c
+++ b/src/cheese-flash.c
@@ -54,7 +54,7 @@ cheese_flash_window_expose_event_cb (GtkWidget *widget, GdkEventExpose *event, g
 {
   cairo_t *cr;
 
-  cr = gdk_cairo_create (widget->window);
+  cr = gdk_cairo_create (gtk_widget_get_window (widget));
   cairo_set_source_rgb (cr, 1, 1, 1);
   cairo_rectangle (cr, event->area.x, event->area.y, event->area.width, event->area.height);
   cairo_fill (cr);
@@ -89,7 +89,7 @@ cheese_flash_init (CheeseFlash *self)
   gtk_widget_realize (GTK_WIDGET (window));
   GdkRegion *input_region;
   input_region = gdk_region_new ();
-  gdk_window_input_shape_combine_region (GTK_WIDGET (window)->window, input_region, 0, 0);
+  gdk_window_input_shape_combine_region (gtk_widget_get_window (GTK_WIDGET (window)), input_region, 0, 0);
   gdk_region_destroy (input_region);
 
   g_signal_connect (G_OBJECT (window), "expose-event", G_CALLBACK (cheese_flash_window_expose_event_cb), NULL);
diff --git a/src/cheese-thumb-view.c b/src/cheese-thumb-view.c
index fb22c21..c1a5494 100644
--- a/src/cheese-thumb-view.c
+++ b/src/cheese-thumb-view.c
@@ -394,8 +394,8 @@ cheese_thumb_view_on_drag_data_get_cb (GtkIconView      *thumb_view,
 
     g_free (str);
   }
-  gtk_selection_data_set (data, data->target, 8,
-                          (guchar *) uris, strlen (uris));
+  gtk_selection_data_set (data, gtk_selection_data_get_target (data),
+                          8, (guchar *) uris, strlen (uris));
   g_free (uris);
   g_list_free (list);
 }
diff --git a/src/cheese-webcam.c b/src/cheese-webcam.c
index 9e77d48..3043425 100644
--- a/src/cheese-webcam.c
+++ b/src/cheese-webcam.c
@@ -165,7 +165,8 @@ cheese_webcam_set_x_overlay (CheeseWebcam *webcam)
                                     "force-aspect-ratio"))
     g_object_set (G_OBJECT (overlay), "force-aspect-ratio", TRUE, NULL);
 
-  gst_x_overlay_set_xwindow_id (overlay, GDK_WINDOW_XWINDOW (priv->video_window->window));
+  gst_x_overlay_set_xwindow_id (overlay,
+                                GDK_WINDOW_XWINDOW (gtk_widget_get_window (priv->video_window)));
 }
 
 static void
diff --git a/src/cheese-window.c b/src/cheese-window.c
index 173d280..027882f 100644
--- a/src/cheese-window.c
+++ b/src/cheese-window.c
@@ -188,9 +188,9 @@ void
 cheese_window_bring_to_front (gpointer data)
 {
   CheeseWindow *cheese_window     = data;
-  guint32       startup_timestamp = gdk_x11_get_server_time (GTK_WIDGET (cheese_window->window)->window);
+  guint32       startup_timestamp = gdk_x11_get_server_time (gtk_widget_get_window (GTK_WIDGET (cheese_window->window)));
 
-  gdk_x11_window_set_user_time (GTK_WIDGET (cheese_window->window)->window, startup_timestamp);
+  gdk_x11_window_set_user_time (gtk_widget_get_window (GTK_WIDGET (cheese_window->window)), startup_timestamp);
 
   gtk_window_present (GTK_WINDOW (cheese_window->window));
 }
@@ -1248,7 +1248,7 @@ cheese_window_countdown_picture_cb (gpointer data)
 }
 
 static void
-cheese_window_no_camera_message_area_response (GtkWidget *widget, gint response_id, GtkWidget *cheese_window)
+cheese_window_no_camera_message_area_response (GtkWidget *widget, gint response_id, CheeseWindow *cheese_window)
 {
   GError  *error = NULL;
   gboolean ret;
@@ -1719,7 +1719,7 @@ cheese_window_create_window (CheeseWindow *cheese_window)
   gtk_container_add (GTK_CONTAINER (cheese_window->countdown_frame_fullscreen), cheese_window->countdown_fullscreen);
 
   gtk_widget_realize (cheese_window->screen);
-  gdk_window_set_back_pixmap (cheese_window->screen->window, NULL, FALSE);
+  gdk_window_set_back_pixmap (gtk_widget_get_window (cheese_window->screen), NULL, FALSE);
   gtk_widget_set_app_paintable (cheese_window->screen, TRUE);
   gtk_widget_set_double_buffered (cheese_window->screen, FALSE);
   gtk_widget_add_events (cheese_window->screen, GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK);
diff --git a/src/eog-thumb-nav.c b/src/eog-thumb-nav.c
index f8322a7..ff808ef 100644
--- a/src/eog-thumb-nav.c
+++ b/src/eog-thumb-nav.c
@@ -66,6 +66,7 @@ eog_thumb_nav_scroll_event (GtkWidget *widget, GdkEventScroll *event, gpointer u
 {
 	EogThumbNav *nav = EOG_THUMB_NAV (user_data);
 	gint inc = EOG_THUMB_NAV_SCROLL_INC * 3;
+	gdouble value, upper, page_size;
 
 	switch (event->direction) {
 	case GDK_SCROLL_UP:
@@ -82,10 +83,14 @@ eog_thumb_nav_scroll_event (GtkWidget *widget, GdkEventScroll *event, gpointer u
 		return FALSE;
 	}
 
+	value = gtk_adjustment_get_value (nav->priv->adj);
 	if (inc < 0)
-		nav->priv->adj->value = MAX (0, nav->priv->adj->value + inc);
-	else
-		nav->priv->adj->value = MIN (nav->priv->adj->upper - nav->priv->adj->page_size, nav->priv->adj->value + inc);
+		gtk_adjustment_set_value (nav->priv->adj, MAX (0, value + inc));
+	else {
+	        upper = gtk_adjustment_get_upper (nav->priv->adj);
+		page_size = gtk_adjustment_get_page_size (nav->priv->adj);
+		gtk_adjustment_set_value (nav->priv->adj, MIN (upper - page_size, value + inc));
+                                          }
 
 	gtk_adjustment_value_changed (nav->priv->adj);
 
@@ -98,13 +103,20 @@ eog_thumb_nav_adj_changed (GtkAdjustment *adj, gpointer user_data)
 	EogThumbNav *nav;
 	EogThumbNavPrivate *priv;
 	gboolean ltr;
+	gdouble value, upper, page_size;
 
 	nav = EOG_THUMB_NAV (user_data);
 	priv = EOG_THUMB_NAV_GET_PRIVATE (nav);
 	ltr = gtk_widget_get_direction (priv->sw) == GTK_TEXT_DIR_LTR;
 
+	g_object_get (adj,
+		      "value", &value,
+		      "upper", &upper,
+		      "page_size", &page_size,
+		      NULL);
+
 	gtk_widget_set_sensitive (ltr ? priv->button_right : priv->button_left,
-				  adj->value < adj->upper - adj->page_size);
+				  value < upper - page_size);
 }
 
 static void
@@ -113,15 +125,22 @@ eog_thumb_nav_adj_value_changed (GtkAdjustment *adj, gpointer user_data)
 	EogThumbNav *nav;
 	EogThumbNavPrivate *priv;
 	gboolean ltr;
+	gdouble value, upper, page_size;
 
 	nav = EOG_THUMB_NAV (user_data);
 	priv = EOG_THUMB_NAV_GET_PRIVATE (nav);
 	ltr = gtk_widget_get_direction (priv->sw) == GTK_TEXT_DIR_LTR;
 
-	gtk_widget_set_sensitive (ltr ? priv->button_left : priv->button_right, adj->value > 0);
+	g_object_get (adj,
+		      "value", &value,
+		      "upper", &upper,
+		      "page_size", &page_size,
+		      NULL);
+
+	gtk_widget_set_sensitive (ltr ? priv->button_left : priv->button_right, value > 0);
 
 	gtk_widget_set_sensitive (ltr ? priv->button_right : priv->button_left,
-				  adj->value < adj->upper - adj->page_size);
+				  value < upper - page_size);
 }
 
 static gboolean
@@ -129,6 +148,7 @@ eog_thumb_nav_scroll_step (gpointer user_data)
 {
 	EogThumbNav *nav = EOG_THUMB_NAV (user_data);
 	gint delta;
+	gdouble value, upper, page_size;
 
 	if (nav->priv->scroll_pos < 10)
 		delta = EOG_THUMB_NAV_SCROLL_INC;
@@ -142,16 +162,22 @@ eog_thumb_nav_scroll_step (gpointer user_data)
 	if (!nav->priv->scroll_dir)
 		delta *= -1;
 
-	if ((gint) (nav->priv->adj->value + (gdouble) delta) >= 0 &&
-	    (gint) (nav->priv->adj->value + (gdouble) delta) <= nav->priv->adj->upper - nav->priv->adj->page_size) {
-		nav->priv->adj->value += (gdouble) delta; 
+	g_object_get (nav->priv->adj,
+		      "value", &value,
+		      "upper", &upper,
+		      "page_size", &page_size,
+		      NULL);
+
+	if ((gint) (value + (gdouble) delta) >= 0 &&
+	    (gint) (value + (gdouble) delta) <= upper - page_size) {
+		gtk_adjustment_set_value (nav->priv->adj, value + (gdouble) delta);
 		nav->priv->scroll_pos++;
 		gtk_adjustment_value_changed (nav->priv->adj);
 	} else {
 		if (delta > 0)
-		      nav->priv->adj->value = nav->priv->adj->upper - nav->priv->adj->page_size;
+		      gtk_adjustment_set_value (nav->priv->adj, upper - page_size);
 		else
-		      nav->priv->adj->value = 0;
+		      gtk_adjustment_set_value (nav->priv->adj, 0);
 
 		nav->priv->scroll_pos = 0;
 		
@@ -330,7 +356,7 @@ eog_thumb_nav_init (EogThumbNav *nav)
 
 	priv->sw = gtk_scrolled_window_new (NULL, NULL);
 
-	gtk_widget_set_name (GTK_SCROLLED_WINDOW (priv->sw)->hscrollbar, 
+	gtk_widget_set_name (gtk_scrolled_window_get_hscrollbar (GTK_SCROLLED_WINDOW (priv->sw)),
 			     "eog-image-collection-scrollbar");
 
 	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (priv->sw), 
diff --git a/src/ephy-spinner.c b/src/ephy-spinner.c
index 5fc0182..c506f43 100644
--- a/src/ephy-spinner.c
+++ b/src/ephy-spinner.c
@@ -664,8 +664,8 @@ ephy_spinner_expose (GtkWidget *widget,
 		return FALSE;
 	}
 
-	gc = gdk_gc_new (widget->window);
-	gdk_draw_pixbuf (widget->window, gc, pixbuf,
+	gc = gdk_gc_new (gtk_widget_get_window (widget));
+	gdk_draw_pixbuf (gtk_widget_get_window (widget), gc, pixbuf,
 			 dest.x - x_offset - widget->allocation.x,
 			 dest.y - y_offset - widget->allocation.y,
 			 dest.x, dest.y,
diff --git a/src/gedit-message-area.c b/src/gedit-message-area.c
index 39ae0df..3e97f88 100644
--- a/src/gedit-message-area.c
+++ b/src/gedit-message-area.c
@@ -142,8 +142,8 @@ paint_message_area (GtkWidget      *widget,
                     GdkEventExpose *event,
                     gpointer        user_data)
 {
-  gtk_paint_flat_box (widget->style,
-                      widget->window,
+  gtk_paint_flat_box (gtk_widget_get_style (widget),
+                      gtk_widget_get_window (widget),
                       GTK_STATE_NORMAL,
                       GTK_SHADOW_OUT,
                       NULL,
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]