From 4714ce9aa62d4f1b8682d8cdc7506939337e3383 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Thu, 6 Nov 2008 23:52:30 +0000 Subject: [PATCH] remove bogus newlines in the middle of function calls, fix broken 2008-11-07 Michael Natterer * gtk/gtkscrollbar.c: remove bogus newlines in the middle of function calls, fix broken indentation and remove trailing whitespace. svn path=/trunk/; revision=21769 --- ChangeLog | 6 ++++++ gtk/gtkscrollbar.c | 54 ++++++++++++++++++++-------------------------- 2 files changed, 29 insertions(+), 31 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5e13165659..783a920111 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-11-07 Michael Natterer + + * gtk/gtkscrollbar.c: remove bogus newlines in the middle of + function calls, fix broken indentation and remove trailing + whitespace. + 2008-11-06 Tristan Van Berkom * gtk/gtkmenuitem.c: Made buildable and added support for adding diff --git a/gtk/gtkscrollbar.c b/gtk/gtkscrollbar.c index 56ebe6cb22..cd81b8ba10 100644 --- a/gtk/gtkscrollbar.c +++ b/gtk/gtkscrollbar.c @@ -22,29 +22,28 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #include "config.h" + #include "gtkscrollbar.h" #include "gtkintl.h" #include "gtkprivate.h" #include "gtkalias.h" -static void gtk_scrollbar_style_set (GtkWidget *widget, - GtkStyle *previous); +static void gtk_scrollbar_style_set (GtkWidget *widget, + GtkStyle *previous); G_DEFINE_ABSTRACT_TYPE (GtkScrollbar, gtk_scrollbar, GTK_TYPE_RANGE) static void gtk_scrollbar_class_init (GtkScrollbarClass *class) { - GtkWidgetClass *widget_class; - - widget_class = GTK_WIDGET_CLASS (class); + GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class); widget_class->style_set = gtk_scrollbar_style_set; - + gtk_widget_class_install_style_property (widget_class, g_param_spec_int ("min-slider-length", P_("Minimum Slider Length"), @@ -59,40 +58,35 @@ gtk_scrollbar_class_init (GtkScrollbarClass *class) P_("Fixed slider size"), P_("Don't change slider size, just lock it to the minimum length"), FALSE, - GTK_PARAM_READABLE)); - + gtk_widget_class_install_style_property (widget_class, g_param_spec_boolean ("has-backward-stepper", P_("Backward stepper"), P_("Display the standard backward arrow button"), TRUE, - GTK_PARAM_READABLE)); - gtk_widget_class_install_style_property (widget_class, - g_param_spec_boolean ("has-forward-stepper", - P_("Forward stepper"), - P_("Display the standard forward arrow button"), - TRUE, - - GTK_PARAM_READABLE)); + gtk_widget_class_install_style_property (widget_class, + g_param_spec_boolean ("has-forward-stepper", + P_("Forward stepper"), + P_("Display the standard forward arrow button"), + TRUE, + GTK_PARAM_READABLE)); gtk_widget_class_install_style_property (widget_class, g_param_spec_boolean ("has-secondary-backward-stepper", P_("Secondary backward stepper"), P_("Display a second backward arrow button on the opposite end of the scrollbar"), FALSE, - GTK_PARAM_READABLE)); - gtk_widget_class_install_style_property (widget_class, - g_param_spec_boolean ("has-secondary-forward-stepper", - P_("Secondary forward stepper"), - P_("Display a second forward arrow button on the opposite end of the scrollbar"), - FALSE, - - GTK_PARAM_READABLE)); + gtk_widget_class_install_style_property (widget_class, + g_param_spec_boolean ("has-secondary-forward-stepper", + P_("Secondary forward stepper"), + P_("Display a second forward arrow button on the opposite end of the scrollbar"), + FALSE, + GTK_PARAM_READABLE)); } static void @@ -101,16 +95,14 @@ gtk_scrollbar_init (GtkScrollbar *scrollbar) } static void -gtk_scrollbar_style_set (GtkWidget *widget, - GtkStyle *previous) +gtk_scrollbar_style_set (GtkWidget *widget, + GtkStyle *previous) { + GtkRange *range = GTK_RANGE (widget); gint slider_length; gboolean fixed_size; gboolean has_a, has_b, has_c, has_d; - GtkRange *range; - range = GTK_RANGE (widget); - gtk_widget_style_get (widget, "min-slider-length", &slider_length, "fixed-slider-length", &fixed_size, @@ -119,7 +111,7 @@ gtk_scrollbar_style_set (GtkWidget *widget, "has-secondary-backward-stepper", &has_c, "has-forward-stepper", &has_d, NULL); - + range->min_slider_size = slider_length; range->slider_size_fixed = fixed_size;