[anjuta] document-manager: Only use zoom property when the editor supports it.



commit 14b1e8c9856bc60d556fb3fba045708e0901775f
Author: Johannes Schmid <jhs gnome org>
Date:   Mon Jan 25 23:21:58 2010 +0100

    document-manager: Only use zoom property when the editor supports it.

 plugins/document-manager/plugin.c                  |    4 +++-
 .../language-support-cpp-java/cpp-java-assist.c    |    2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/plugins/document-manager/plugin.c b/plugins/document-manager/plugin.c
index 3782d67..824ab11 100644
--- a/plugins/document-manager/plugin.c
+++ b/plugins/document-manager/plugin.c
@@ -920,7 +920,6 @@ update_status (DocmanPlugin *plugin, IAnjutaEditor *te)
 		if (status == NULL)
 			return;
 		
-		zoom = anjuta_preferences_get_int (plugin->prefs, TEXT_ZOOM_FACTOR);
 		line = ianjuta_editor_get_lineno (te, NULL);
 		col = ianjuta_editor_get_column (te, NULL);
 			
@@ -934,7 +933,10 @@ update_status (DocmanPlugin *plugin, IAnjutaEditor *te)
 		}
 		
 		if (IANJUTA_IS_EDITOR_ZOOM(te))
+		{
+			zoom = anjuta_preferences_get_int (plugin->prefs, TEXT_ZOOM_FACTOR);
 			anjuta_status_set_default (status, _("Zoom"), "%d", zoom);
+		}
 		else
 			anjuta_status_set_default (status, _("Zoom"), NULL);
 		
diff --git a/plugins/language-support-cpp-java/cpp-java-assist.c b/plugins/language-support-cpp-java/cpp-java-assist.c
index 9e3138c..d36866a 100644
--- a/plugins/language-support-cpp-java/cpp-java-assist.c
+++ b/plugins/language-support-cpp-java/cpp-java-assist.c
@@ -751,7 +751,7 @@ is_expression_separator (gchar c, gboolean skip_braces, IAnjutaIterable* iter)
 static IAnjutaIterable*
 cpp_java_parse_expression (CppJavaAssist* assist, IAnjutaIterable* iter, IAnjutaIterable** start_iter)
 {
-	IAnjutaEditor* editor = editor = IANJUTA_EDITOR (assist->priv->iassist);
+	IAnjutaEditor* editor = IANJUTA_EDITOR (assist->priv->iassist);
 	IAnjutaIterable* res = NULL;
 	IAnjutaIterable* cur_pos = ianjuta_iterable_clone (iter, NULL);
 	gboolean op_start = FALSE;



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