diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2010-01-31 03:03:19 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-04-08 23:05:26 +0800 |
| commit | 72797decc12602b181f69dba7c54df7a0d1b9326 (patch) | |
| tree | ecd1314c92bc26b59647b351b2d47e446f4ed21d /addressbook/gui/widgets/e-minicard-view-widget.c | |
| parent | 3ba0b61f9f447b01c3a83bfb78ee33a45d413700 (diff) | |
| download | gsoc2013-evolution-72797decc12602b181f69dba7c54df7a0d1b9326.tar gsoc2013-evolution-72797decc12602b181f69dba7c54df7a0d1b9326.tar.gz gsoc2013-evolution-72797decc12602b181f69dba7c54df7a0d1b9326.tar.bz2 gsoc2013-evolution-72797decc12602b181f69dba7c54df7a0d1b9326.tar.lz gsoc2013-evolution-72797decc12602b181f69dba7c54df7a0d1b9326.tar.xz gsoc2013-evolution-72797decc12602b181f69dba7c54df7a0d1b9326.tar.zst gsoc2013-evolution-72797decc12602b181f69dba7c54df7a0d1b9326.zip | |
Giant leap towards GSEAL compliance.
Diffstat (limited to 'addressbook/gui/widgets/e-minicard-view-widget.c')
| -rw-r--r-- | addressbook/gui/widgets/e-minicard-view-widget.c | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/addressbook/gui/widgets/e-minicard-view-widget.c b/addressbook/gui/widgets/e-minicard-view-widget.c index 0244d13d34..7a78d83a42 100644 --- a/addressbook/gui/widgets/e-minicard-view-widget.c +++ b/addressbook/gui/widgets/e-minicard-view-widget.c @@ -361,11 +361,14 @@ static void e_minicard_view_widget_style_set (GtkWidget *widget, GtkStyle *previous_style) { EMinicardViewWidget *view = E_MINICARD_VIEW_WIDGET(widget); + GtkStyle *style; + + style = gtk_widget_get_style (widget); if (view->background) - gnome_canvas_item_set (view->background, - "fill_color_gdk", &widget->style->base[GTK_STATE_NORMAL], - NULL ); + gnome_canvas_item_set ( + view->background, "fill_color_gdk", + &style->base[GTK_STATE_NORMAL], NULL); if (GTK_WIDGET_CLASS(parent_class)->style_set) GTK_WIDGET_CLASS(parent_class)->style_set (widget, previous_style); @@ -420,11 +423,7 @@ e_minicard_view_widget_size_allocate(GtkWidget *widget, GtkAllocation *allocatio if (GTK_WIDGET_CLASS(parent_class)->size_allocate) GTK_WIDGET_CLASS(parent_class)->size_allocate (widget, allocation); -#if GTK_CHECK_VERSION(2,19,7) if (gtk_widget_get_realized (widget)) { -#else - if (GTK_WIDGET_REALIZED(widget)) { -#endif gdouble width; EMinicardViewWidget *view = E_MINICARD_VIEW_WIDGET(widget); @@ -447,15 +446,18 @@ e_minicard_view_widget_reflow(ECanvas *canvas) { gdouble width; EMinicardViewWidget *view = E_MINICARD_VIEW_WIDGET(canvas); + GtkAllocation allocation; if (E_CANVAS_CLASS(parent_class)->reflow) E_CANVAS_CLASS(parent_class)->reflow (canvas); - g_object_get(view->emv, - "width", &width, - NULL); - width = MAX(width, GTK_WIDGET(canvas)->allocation.width); - gnome_canvas_set_scroll_region(GNOME_CANVAS(canvas), 0, 0, width - 1, GTK_WIDGET(canvas)->allocation.height - 1); + g_object_get (view->emv, "width", &width, NULL); + gtk_widget_get_allocation (GTK_WIDGET (canvas), &allocation); + + gnome_canvas_set_scroll_region ( + GNOME_CANVAS(canvas), 0, 0, + MAX (width, allocation.width) - 1, + allocation.height - 1); } ESelectionModel * |