gtksourceview r2194 - in branches/indenters: . gtksourceview tests

[icq svn gnome org]

Author: icq
Date: Sun Mar  1 11:47:20 2009
New Revision: 2194
URL: http://svn.gnome.org/viewvc/gtksourceview?rev=2194&view=rev

Log:
2009-03-01  Ignacio Casal Quinteiro  <nacho resa gmail com>

        * gtksourceview/gtksourceindentermanager.c:
        * gtksourceview/gtksourceindenter-utils.c:
        * gtksourceview/gtksourceview.c:
        * gtksourceview/gtksourceindenter-utils.h:
        * tests/test-widget.c:
        Fix compilation warnings.



Modified:
   branches/indenters/ChangeLog
   branches/indenters/gtksourceview/gtksourceindenter-utils.c
   branches/indenters/gtksourceview/gtksourceindenter-utils.h
   branches/indenters/gtksourceview/gtksourceindentermanager.c
   branches/indenters/gtksourceview/gtksourceview.c
   branches/indenters/tests/test-widget.c

Modified: branches/indenters/gtksourceview/gtksourceindenter-utils.c
==============================================================================
--- branches/indenters/gtksourceview/gtksourceindenter-utils.c	(original)
+++ branches/indenters/gtksourceview/gtksourceindenter-utils.c	Sun Mar  1 11:47:20 2009
@@ -27,7 +27,7 @@
 #include "gtksourceindenter-utils.h"
 #include "gtksourceview-utils.h"
 #include "gtksourceview.h"
-
+#include <math.h>
 
 gfloat
 gtk_source_indenter_get_amount_indents (GtkTextView *view,
@@ -255,7 +255,7 @@
 	
 	indent_width = _gtk_source_view_get_real_indent_width (GTK_SOURCE_VIEW (view));
 	tabs = (gint)current_level;
-	spaces = round (10 * (gfloat)(current_level - tabs));
+	spaces = rint (10 * (gfloat)(current_level - tabs));
 	
 	/*
 	 * We add the new space

Modified: branches/indenters/gtksourceview/gtksourceindenter-utils.h
==============================================================================
--- branches/indenters/gtksourceview/gtksourceindenter-utils.h	(original)
+++ branches/indenters/gtksourceview/gtksourceindenter-utils.h	Sun Mar  1 11:47:20 2009
@@ -20,11 +20,11 @@
  * Boston, MA  02110-1301  USA
  */
 
-#ifndef __GTK_SOURCE_VIEW_UTILS_H__
-#define __GTK_SOURCE_VIEW_UTILS_H__
+#ifndef __GTK_SOURCE_INDENTER_UTILS_H__
+#define __GTK_SOURCE_INDENTER_UTILS_H__
 
 #include <glib.h>
-#include "gtksourceview.h"
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: branches/indenters/gtksourceview/gtksourceindentermanager.c
==============================================================================
--- branches/indenters/gtksourceview/gtksourceindentermanager.c	(original)
+++ branches/indenters/gtksourceview/gtksourceindentermanager.c	Sun Mar  1 11:47:20 2009
@@ -21,7 +21,7 @@
 #include "gtksourceindentermanager.h"
 #include "c-indenter.h"
 #include "simple-indenter.h"
-
+#include <string.h>
 
 #define GTK_SOURCE_INDENTER_MANAGER_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object), GTK_TYPE_SOURCE_INDENTER_MANAGER, GtkSourceIndenterManagerPrivate))
 

Modified: branches/indenters/gtksourceview/gtksourceview.c
==============================================================================
--- branches/indenters/gtksourceview/gtksourceview.c	(original)
+++ branches/indenters/gtksourceview/gtksourceview.c	Sun Mar  1 11:47:20 2009
@@ -32,6 +32,7 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <pango/pango-tabs.h>
+#include <math.h>
 
 #include "gtksourceview-i18n.h"
 
@@ -2790,7 +2791,7 @@
 	gint indent_width;
 	
 	tabs = (gint)level;
-	spaces = round (10 * (gfloat)(level - tabs));
+	spaces = rint (10 * (gfloat)(level - tabs));
 	indent_width = _gtk_source_view_get_real_indent_width (view);
 	
 	if (view->priv->insert_spaces)

Modified: branches/indenters/tests/test-widget.c
==============================================================================
--- branches/indenters/tests/test-widget.c	(original)
+++ branches/indenters/tests/test-widget.c	Sun Mar  1 11:47:20 2009
@@ -266,7 +266,7 @@
 					 GTK_DIALOG_DESTROY_WITH_PARENT,
 					 GTK_MESSAGE_ERROR,
 					 GTK_BUTTONS_OK,
-					 tmp);
+					 "%s", tmp);
 	g_free (tmp);
 
 	gtk_dialog_run (GTK_DIALOG (dialog));