diff options
-rw-r--r-- | capplets/common/mate-theme-info.c | 3 | ||||
-rw-r--r-- | capplets/display/scrollarea.c | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/capplets/common/mate-theme-info.c b/capplets/common/mate-theme-info.c index a3dddece..2e58b6d7 100644 --- a/capplets/common/mate-theme-info.c +++ b/capplets/common/mate-theme-info.c @@ -1685,7 +1685,6 @@ void mate_theme_meta_info_free(MateThemeMetaInfo* meta_theme_info) gboolean mate_theme_meta_info_validate(const MateThemeMetaInfo* info, GError** error) { MateThemeInfo* theme; - gchar* engine; g_return_val_if_fail (error == NULL || *error == NULL, FALSE); @@ -1719,7 +1718,7 @@ gboolean mate_theme_meta_info_validate(const MateThemeMetaInfo* info, GError** e #if !GTK_CHECK_VERSION (3, 0, 0) /* check for gtk theme engines */ - engine = gtk_theme_info_missing_engine(info->gtk_theme_name, TRUE); + gchar *engine = gtk_theme_info_missing_engine(info->gtk_theme_name, TRUE); if (engine != NULL) { diff --git a/capplets/display/scrollarea.c b/capplets/display/scrollarea.c index 711984a4..dba9d262 100644 --- a/capplets/display/scrollarea.c +++ b/capplets/display/scrollarea.c @@ -617,9 +617,9 @@ foo_scroll_area_expose (GtkWidget *widget, #if !GTK_CHECK_VERSION (3, 0, 0) GdkRectangle extents; GdkWindow *window = gtk_widget_get_window (widget); + int x_offset, y_offset; #endif GdkRegion *region; - int x_offset, y_offset; GtkAllocation widget_allocation; #if !GTK_CHECK_VERSION (3, 0, 0) @@ -637,10 +637,10 @@ foo_scroll_area_expose (GtkWidget *widget, * priv->{x,y}_offset. */ +#if !GTK_CHECK_VERSION (3, 0, 0) x_offset = scroll_area->priv->x_offset; y_offset = scroll_area->priv->y_offset; -#if !GTK_CHECK_VERSION (3, 0, 0) scroll_area->priv->expose_region = expose->region; #endif |