diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-08-16 23:25:08 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-08-16 23:42:26 +0800 |
| commit | 672adf12a0923437e90d08ab7925bd9329fcce0d (patch) | |
| tree | 53c076d56359c111085dad615295ecf0f5be7342 /widgets | |
| parent | c4716bf2e904a4bcf573ee30841378c1f53092ee (diff) | |
| download | gsoc2013-evolution-672adf12a0923437e90d08ab7925bd9329fcce0d.tar.gz gsoc2013-evolution-672adf12a0923437e90d08ab7925bd9329fcce0d.tar.zst gsoc2013-evolution-672adf12a0923437e90d08ab7925bd9329fcce0d.zip | |
Fix compiler warnings and deprecated GTK+ API usage.
Diffstat (limited to 'widgets')
| -rw-r--r-- | widgets/misc/e-attachment-button.c | 6 | ||||
| -rw-r--r-- | widgets/misc/e-menu-tool-button.c | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/widgets/misc/e-attachment-button.c b/widgets/misc/e-attachment-button.c index d64dcafb4a..1cd517d3e2 100644 --- a/widgets/misc/e-attachment-button.c +++ b/widgets/misc/e-attachment-button.c @@ -199,7 +199,7 @@ exit: static void attachment_button_update_pixbufs (EAttachmentButton *button) { - GtkCellView *cell_view; + GtkCellLayout *cell_layout; GtkCellRenderer *renderer; GtkIconTheme *icon_theme; GdkPixbuf *pixbuf_expander_open; @@ -209,8 +209,8 @@ attachment_button_update_pixbufs (EAttachmentButton *button) icon_theme = gtk_icon_theme_get_default (); /* Grab the first cell renderer. */ - cell_view = GTK_CELL_VIEW (button->priv->cell_view); - list = gtk_cell_view_get_cell_renderers (cell_view); + cell_layout = GTK_CELL_LAYOUT (button->priv->cell_view); + list = gtk_cell_layout_get_cells (cell_layout); renderer = GTK_CELL_RENDERER (list->data); g_list_free (list); diff --git a/widgets/misc/e-menu-tool-button.c b/widgets/misc/e-menu-tool-button.c index 53778e6678..58c8317053 100644 --- a/widgets/misc/e-menu-tool-button.c +++ b/widgets/misc/e-menu-tool-button.c @@ -84,7 +84,8 @@ menu_tool_button_update_button (GtkToolButton *tool_button) /* If the menu item is a proxy for a GtkAction, extract * the action's tooltip and use it as our own tooltip. */ - action = gtk_widget_get_action (GTK_WIDGET (menu_item)); + action = gtk_activatable_get_related_action ( + GTK_ACTIVATABLE (menu_item)); if (action != NULL) g_object_get (action, "tooltip", &tooltip, NULL); gtk_widget_set_tooltip_text (GTK_WIDGET (tool_button), tooltip); |