anjuta r4720 - in trunk: . plugins/language-support-cpp-java src

[jhs svn gnome org]

Author: jhs
Date: Mon Feb  9 21:56:53 2009
New Revision: 4720
URL: http://svn.gnome.org/viewvc/anjuta?rev=4720&view=rev

Log:
2009-02-09  Johannes Schmid  <jhs gnome org>

	* plugins/language-support-cpp-java/plugin.c
	(get_line_indentation_string), (get_line_indentation_base):
	Removed debugging output
	
	* src/main.c (main):
	Reintroduce gnome_program_init() to avoid warnings from libgnomeui

Modified:
   trunk/ChangeLog
   trunk/plugins/language-support-cpp-java/plugin.c
   trunk/src/main.c

Modified: trunk/plugins/language-support-cpp-java/plugin.c
==============================================================================
--- trunk/plugins/language-support-cpp-java/plugin.c	(original)
+++ trunk/plugins/language-support-cpp-java/plugin.c	Mon Feb  9 21:56:53 2009
@@ -192,9 +192,6 @@
 	
 	g_return_val_if_fail (spaces >= 0, NULL);
 	
-	
-	g_warning ("Spaces: %d", line_indent_spaces);
-	
 	if (spaces <= 0)
 		return NULL;
 	
@@ -1180,9 +1177,7 @@
 		line_indent += extra_indent;
 	}
 	g_object_unref (iter);
-	
-	g_warning ("Proposed spaces: %d", *line_indent_spaces);
-	
+		
 	return line_indent;
 }
 

Modified: trunk/src/main.c
==============================================================================
--- trunk/src/main.c	(original)
+++ trunk/src/main.c	Mon Feb  9 21:56:53 2009
@@ -33,6 +33,7 @@
 #include <libanjuta/resources.h>
 #include <libanjuta/anjuta-debug.h>
 #include <libanjuta/interfaces/ianjuta-file-loader.h>
+#include <gnome.h>
 
 #include "anjuta.h"
 
@@ -163,7 +164,15 @@
 	g_option_context_add_main_entries (context, anjuta_options, NULL);
 #endif
 	
-	g_option_context_add_group (context, gtk_get_option_group (TRUE));
+	/* gnome_program_init() does this for us - enable when it's removed */
+	/* g_option_context_add_group (context, gtk_get_option_group (TRUE));*/
+	/* Init Gnome - remove once we get rid of libgnome */
+	gnome_program_init (PACKAGE, VERSION,
+	                    LIBGNOMEUI_MODULE, argc, argv,
+	                    GNOME_PARAM_GOPTION_CONTEXT, context,
+	                    GNOME_PARAM_HUMAN_READABLE_NAME,
+	                    _("Integrated Development Environment"),
+	                    GNOME_PARAM_NONE);
 	
     /* Initialize threads, if possible */
 #ifdef G_THREADS_ENABLED