aboutsummaryrefslogtreecommitdiffstats
path: root/capplet/settings
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2010-04-13 13:20:31 +0800
committerJavier Jardón <jjardon@gnome.org>2010-04-13 22:23:16 +0800
commit96421ff37cd554af1ac11527bcad25cc2f2f1930 (patch)
tree3f1a0d1ded8ab241481df3eb1ae1772c137eff7f /capplet/settings
parent7e931d4c10c0b0d06c9df571589d003e43790690 (diff)
downloadgsoc2013-evolution-96421ff37cd554af1ac11527bcad25cc2f2f1930.tar
gsoc2013-evolution-96421ff37cd554af1ac11527bcad25cc2f2f1930.tar.gz
gsoc2013-evolution-96421ff37cd554af1ac11527bcad25cc2f2f1930.tar.bz2
gsoc2013-evolution-96421ff37cd554af1ac11527bcad25cc2f2f1930.tar.lz
gsoc2013-evolution-96421ff37cd554af1ac11527bcad25cc2f2f1930.tar.xz
gsoc2013-evolution-96421ff37cd554af1ac11527bcad25cc2f2f1930.tar.zst
gsoc2013-evolution-96421ff37cd554af1ac11527bcad25cc2f2f1930.zip
Use accessor functions instead direct access (GSEAL work)
Still remaining: GtkAccessible::widget GtkAssistant::forward GtkAssistant::back GtkObject::flags GtkTreeStore::stamp The GtkAssistant fields are related to bug #596428. We don't need accessor functions so much as the enhancement described there implemented. https://bugzilla.gnome.org/show_bug.cgi?id=615613
Diffstat (limited to 'capplet/settings')
-rw-r--r--capplet/settings/mail-account-view.c4
-rw-r--r--capplet/settings/mail-capplet-shell.c6
-rw-r--r--capplet/settings/mail-decoration.c20
-rw-r--r--capplet/settings/mail-settings-view.c4
4 files changed, 26 insertions, 8 deletions
diff --git a/capplet/settings/mail-account-view.c b/capplet/settings/mail-account-view.c
index e97abdc6dc..8c488af5b4 100644
--- a/capplet/settings/mail-account-view.c
+++ b/capplet/settings/mail-account-view.c
@@ -636,7 +636,9 @@ static gboolean
mav_btn_expose (GtkWidget *w, GdkEventExpose *event, MailAccountView *mfv)
{
GdkPixbuf *img = g_object_get_data ((GObject *)w, "pbuf");
- cairo_t *cr = gdk_cairo_create (w->window);
+ cairo_t *cr;
+
+ cr = gdk_cairo_create (gtk_widget_get_window (w));
cairo_save (cr);
gdk_cairo_set_source_pixbuf (cr, img, event->area.x-5, event->area.y-4);
cairo_paint(cr);
diff --git a/capplet/settings/mail-capplet-shell.c b/capplet/settings/mail-capplet-shell.c
index da22b9d0d5..3c5803b89a 100644
--- a/capplet/settings/mail-capplet-shell.c
+++ b/capplet/settings/mail-capplet-shell.c
@@ -267,7 +267,11 @@ mail_capplet_shell_construct (MailCappletShell *shell, gint socket_id, gboolean
gint
mail_capplet_shell_toolbar_height (MailCappletShell *shell)
{
- return shell->priv->top_bar->allocation.height;
+ GtkAllocation allocation;
+
+ gtk_widget_get_allocation (shell->priv->top_bar, &allocation);
+
+ return allocation.height;
}
MailCappletShell *
diff --git a/capplet/settings/mail-decoration.c b/capplet/settings/mail-decoration.c
index 056283dabe..d3cddc9b28 100644
--- a/capplet/settings/mail-decoration.c
+++ b/capplet/settings/mail-decoration.c
@@ -86,7 +86,7 @@ md_translate_position (GdkWindow *w, double ex, double ey, gint *x, gint *y, Gtk
*x = (gint)ex;
*y = (gint)ey;
- while (w && w != window->window) {
+ while (w && w != gtk_widget_get_window (window)) {
gint cx, cy, cw, ch, cd;
gdk_window_get_geometry (w, &cx, &cy, &cw, &ch, &cd);
*x += cx;
@@ -110,19 +110,28 @@ in_left (MailDecoration *md, double x)
static gboolean
in_bottom (MailDecoration *md, double y)
{
- return y >= ((GtkWidget *)md->window)->allocation.height - md->priv->resize_width;
+ GtkAllocation allocation;
+
+ gtk_widget_get_allocation (GTK_WIDGET (md->window), &allocation);
+
+ return y >= allocation.height - md->priv->resize_width;
}
static gboolean
in_right (MailDecoration *md, double x)
{
- return x >= ((GtkWidget *)md->window)->allocation.width - md->priv->resize_width;
+ GtkAllocation allocation;
+
+ gtk_widget_get_allocation (GTK_WIDGET (md->window), &allocation);
+
+ return x >= allocation.width - md->priv->resize_width;
}
static void
set_cursor (MailDecoration *md, GdkWindowEdge edge)
{
- gdk_window_set_cursor (((GtkWidget *)md->window)->window, md->priv->cursors[edge]);
+ gdk_window_set_cursor (gtk_widget_get_window (GTK_WIDGET (md->window)),
+ md->priv->cursors[edge]);
md->priv->default_cursor = FALSE;
}
@@ -131,7 +140,8 @@ reset_cursor (MailDecoration *md)
{
if (!md->priv->default_cursor) {
md->priv->default_cursor = TRUE;
- gdk_window_set_cursor (((GtkWidget *)md->window)->window, NULL);
+ gdk_window_set_cursor (gtk_widget_get_window (GTK_WIDGET (md->window)),
+ NULL);
}
}
diff --git a/capplet/settings/mail-settings-view.c b/capplet/settings/mail-settings-view.c
index 3a9864ae23..ee5858c893 100644
--- a/capplet/settings/mail-settings-view.c
+++ b/capplet/settings/mail-settings-view.c
@@ -227,7 +227,9 @@ static gboolean
msv_btn_expose (GtkWidget *w, GdkEventExpose *event, MailSettingsView *mfv)
{
GdkPixbuf *img = g_object_get_data ((GObject *)w, "pbuf");
- cairo_t *cr = gdk_cairo_create (w->window);
+ cairo_t *cr;
+
+ cr = gdk_cairo_create (gtk_widget_get_window (w));
cairo_save (cr);
gdk_cairo_set_source_pixbuf (cr, img, event->area.x-5, event->area.y-4);
cairo_paint(cr);