[gnumeric] WorkbookView: clean up setting of attributes.



commit f1d8e293517303e85a4433be0c870bf94f6e7204
Author: Morten Welinder <terra gnome org>
Date:   Mon May 18 14:01:50 2009 -0400

    WorkbookView: clean up setting of attributes.
---
 ChangeLog                     |    2 ++
 plugins/excel/ChangeLog       |    5 +++++
 plugins/excel/ms-excel-read.c |    9 ++++++---
 src/workbook-view.c           |   10 +++++-----
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8628e1f..a36e095 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2009-05-18  Morten Welinder  <terra gnome org>
 
+	* src/workbook-view.c (wb_view_set_property): Normalize booleans.
+
 	* src/sheet-style.c (sheet_style_init_size,
 	sheet_style_set_auto_pattern_color): Use structure assignment, not
 	memcpy.
diff --git a/plugins/excel/ChangeLog b/plugins/excel/ChangeLog
index 2ca0c21..ce68dc9 100644
--- a/plugins/excel/ChangeLog
+++ b/plugins/excel/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-18  Morten Welinder  <terra gnome org>
+
+	* ms-excel-read.c (excel_read_WINDOW1): Use g_object_set instead
+	of poking directly into a WorkbookView.
+
 2009-05-14  Jon K Hellan  <hellan acm org>
 
 	* ms-excel-util.c (init_xl_font_widths): Add DejaVu fonts with
diff --git a/plugins/excel/ms-excel-read.c b/plugins/excel/ms-excel-read.c
index 31ac0f2..84a9e87 100644
--- a/plugins/excel/ms-excel-read.c
+++ b/plugins/excel/ms-excel-read.c
@@ -6494,9 +6494,12 @@ excel_read_WINDOW1 (BiffQuery *q, WorkbookView *wb_view)
 			g_printerr ("Unsupported: Hidden workbook\n");
 		if (options & 0x0002)
 			g_printerr ("Unsupported: Iconic workbook\n");
-		wb_view->show_horizontal_scrollbar = (options & 0x0008);
-		wb_view->show_vertical_scrollbar = (options & 0x0010);
-		wb_view->show_notebook_tabs = (options & 0x0020);
+
+		g_object_set (G_OBJECT (wb_view),
+			      "show-horizontal-scrollbar", (options & 0x0008),
+			      "show-vertical-scrollbar", (options & 0x0010),
+			      "show-notebook-tabs", (options & 0x0020),
+			      NULL);
 	}
 }
 
diff --git a/src/workbook-view.c b/src/workbook-view.c
index 7fd67ba..f1d8621 100644
--- a/src/workbook-view.c
+++ b/src/workbook-view.c
@@ -646,19 +646,19 @@ wb_view_set_property (GObject *object, guint property_id,
 		wb_view_auto_expr_text (wbv, g_value_get_string (value));
 		break;
 	case PROP_SHOW_HORIZONTAL_SCROLLBAR:
-		wbv->show_horizontal_scrollbar = g_value_get_boolean (value);
+		wbv->show_horizontal_scrollbar = !!g_value_get_boolean (value);
 		break;
 	case PROP_SHOW_VERTICAL_SCROLLBAR:
-		wbv->show_vertical_scrollbar = g_value_get_boolean (value);
+		wbv->show_vertical_scrollbar = !!g_value_get_boolean (value);
 		break;
 	case PROP_SHOW_NOTEBOOK_TABS:
-		wbv->show_notebook_tabs = g_value_get_boolean (value);
+		wbv->show_notebook_tabs = !!g_value_get_boolean (value);
 		break;
 	case PROP_DO_AUTO_COMPLETION:
-		wbv->do_auto_completion = g_value_get_boolean (value);
+		wbv->do_auto_completion = !!g_value_get_boolean (value);
 		break;
 	case PROP_PROTECTED:
-		wbv->is_protected = g_value_get_boolean (value);
+		wbv->is_protected = !!g_value_get_boolean (value);
 		break;
 	case PROP_PREFERRED_WIDTH:
 		wbv->preferred_width = g_value_get_int (value);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]