diff options
| author | infirit <[email protected]> | 2015-07-09 16:10:09 +0200 |
|---|---|---|
| committer | infirit <[email protected]> | 2015-07-09 16:10:09 +0200 |
| commit | 88dc45f1bbe2ecf9d1d3fa6cedf09fa425a202ae (patch) | |
| tree | bd9deb665dca1dd8e84c6d0b9573d03cf9a7ced9 | |
| parent | db6b62171abd6dbfcc0c8f9c928f29af445831cc (diff) | |
| download | caja-88dc45f1bbe2ecf9d1d3fa6cedf09fa425a202ae.tar.bz2 caja-88dc45f1bbe2ecf9d1d3fa6cedf09fa425a202ae.tar.xz | |
Use accessor functions instead of direct access
| -rw-r--r-- | eel/eel-wrap-table.c | 5 | ||||
| -rw-r--r-- | src/file-manager/fm-list-view.c | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/eel/eel-wrap-table.c b/eel/eel-wrap-table.c index 2107ceca..d925eadb 100644 --- a/eel/eel-wrap-table.c +++ b/eel/eel-wrap-table.c @@ -799,13 +799,8 @@ wrap_table_child_focus_in (GtkWidget *widget, gtk_widget_translate_coordinates (widget, container, 0, 0, &x, &y); -#if GTK_CHECK_VERSION (3, 0, 0) gtk_adjustment_set_value (hadj, MIN (x, gtk_adjustment_get_upper(hadj) - gtk_adjustment_get_page_size(hadj))); gtk_adjustment_set_value (vadj, MIN (y, gtk_adjustment_get_upper(vadj) - gtk_adjustment_get_page_size(vadj))); -#else - gtk_adjustment_set_value (hadj, MIN (x, hadj->upper - hadj->page_size)); - gtk_adjustment_set_value (vadj, MIN (y, vadj->upper - vadj->page_size)); -#endif } return FALSE; diff --git a/src/file-manager/fm-list-view.c b/src/file-manager/fm-list-view.c index 626c3836..294159a0 100644 --- a/src/file-manager/fm-list-view.c +++ b/src/file-manager/fm-list-view.c @@ -1743,7 +1743,7 @@ create_and_set_up_tree_view (FMListView *view) font_size = PANGO_PIXELS (pango_font_description_get_size ( gtk_style_context_get_font (context, GTK_STATE_FLAG_NORMAL))); #else - font_size = PANGO_PIXELS (pango_font_description_get_size (GTK_WIDGET(view)->style->font_desc)); + font_size = PANGO_PIXELS (pango_font_description_get_size (gtk_widget_get_style (GTK_WIDGET(view))->font_desc)); #endif gtk_tree_view_column_set_min_width (view->details->file_name_column, 20*font_size); g_object_ref_sink (view->details->file_name_column); |