anjuta r4212 - in trunk: . libanjuta plugins/sourceview plugins/symbol-browser

[jhs svn gnome org]

Author: jhs
Date: Tue Sep  2 08:23:30 2008
New Revision: 4212
URL: http://svn.gnome.org/viewvc/anjuta?rev=4212&view=rev

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

	* configure.in:
	* plugins/symbol-browser/an_symbol_view.c
  Do not depend on gdl-gnome anymore  
  
	* libanjuta/anjuta-convert.c (anjuta_convert_to_utf8_from_charset),
	(anjuta_convert_to_utf8):
	Marked two strings for translation
	
	* plugins/sourceview/sourceview-io.c (append_buffer),
	(on_read_finished):
	Fixed file loading bug
	
	* plugins/symbol-browser/an_symbol_info.c (sv_load_symbol_pixbufs):
	(on_symbol_view_row_expanded):
	Fixed Gtk-Criticals

Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/libanjuta/anjuta-convert.c
   trunk/plugins/sourceview/sourceview-io.c
   trunk/plugins/symbol-browser/an_symbol_info.c
   trunk/plugins/symbol-browser/an_symbol_view.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Sep  2 08:23:30 2008
@@ -202,7 +202,7 @@
 
 PKG_CHECK_MODULES(PANGO, pango >= $PANGO_REQUIRED)
 
-PKG_CHECK_MODULES(GDL, gdl-1.0 >= $GDL_REQUIRED gdl-gnome-1.0 >= $GDL_REQUIRED)
+PKG_CHECK_MODULES(GDL, gdl-1.0 >= $GDL_REQUIRED)
 
 PKG_CHECK_MODULES(LIBXSLT, libxslt)
 

Modified: trunk/libanjuta/anjuta-convert.c
==============================================================================
--- trunk/libanjuta/anjuta-convert.c	(original)
+++ trunk/libanjuta/anjuta-convert.c	Tue Sep  2 08:23:30 2008
@@ -71,7 +71,7 @@
 		}
 		else	
 			g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_ILLEGAL_SEQUENCE,
-				     "The file you are trying to open contains an invalid byte sequence.");
+				     _("The file you are trying to open contains an invalid byte sequence."));
 		
 			return NULL;	
 	}
@@ -108,7 +108,7 @@
 		else
 		{	
 			g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_ILLEGAL_SEQUENCE,
-				     "The file you are trying to open contains an invalid byte sequence.");
+				     _("The file you are trying to open contains an invalid byte sequence."));
 		}	
 	} 
 	else 
@@ -165,8 +165,8 @@
 		{
 			g_set_error (error, ANJUTA_CONVERT_ERROR, 
 				     ANJUTA_CONVERT_ERROR_AUTO_DETECTION_FAILED,
-			 	     "anjuta was not able to automatically determine "
-				     "the encoding of the file you want to open.");
+			 	     _("anjuta was not able to automatically determine "
+				     "the encoding of the file you want to open."));
 			return NULL;
 		}
 
@@ -204,8 +204,8 @@
 		{
 			g_set_error (error, ANJUTA_CONVERT_ERROR,
 				     ANJUTA_CONVERT_ERROR_AUTO_DETECTION_FAILED,
-			 	     "anjuta was not able to automatically determine "
-				     "the encoding of the file you want to open.");
+			 	     _("anjuta was not able to automatically determine "
+				     "the encoding of the file you want to open."));
 		}
 
 		g_slist_free (start);

Modified: trunk/plugins/sourceview/sourceview-io.c
==============================================================================
--- trunk/plugins/sourceview/sourceview-io.c	(original)
+++ trunk/plugins/sourceview/sourceview-io.c	Tue Sep  2 08:23:30 2008
@@ -364,7 +364,7 @@
 		{
 			/* Last chance, let's try 8859-15 */
 			enc = anjuta_encoding_get_from_charset( "ISO-8859-15");
-			
+			conv_error = NULL;
 			converted_text = anjuta_convert_to_utf8 (sio->read_buffer,
 													 size,
 													 &enc,
@@ -408,7 +408,7 @@
 	}
 	
 	bytes_read += current_bytes;
-	if (current_bytes == READ_SIZE)
+	if (current_bytes > 0)
 	{
 		sio->read_buffer = g_realloc (sio->read_buffer, bytes_read + READ_SIZE);
 		g_input_stream_read_async (G_INPUT_STREAM (input_stream),

Modified: trunk/plugins/symbol-browser/an_symbol_info.c
==============================================================================
--- trunk/plugins/symbol-browser/an_symbol_info.c	(original)
+++ trunk/plugins/symbol-browser/an_symbol_info.c	Tue Sep  2 08:23:30 2008
@@ -22,9 +22,11 @@
 #include <config.h>
 #endif
 
-#include <gdl/gdl-icons.h>
 #include <libanjuta/resources.h>
 #include "an_symbol_info.h"
+#include <gio/gio.h>
+
+#define ICON_SIZE 16
 
 static AnjutaSymbolInfo* symbol_info_dup (const AnjutaSymbolInfo *from);
 static void symbol_info_free (AnjutaSymbolInfo *sfile);
@@ -252,7 +254,6 @@
 	}
 }
 
-static GdlIcons *icon_set = NULL;
 static GdkPixbuf **sv_symbol_pixbufs = NULL;
 
 #define CREATE_SV_ICON(N, F) \
@@ -267,10 +268,6 @@
 
 	if (sv_symbol_pixbufs)
 		return;
-
-	if (icon_set == NULL)
-		icon_set = gdl_icons_new (16);
-
 	sv_symbol_pixbufs = g_new (GdkPixbuf *, sv_max_t + 1);
 
 	CREATE_SV_ICON (sv_none_t,              "Icons.16x16.Literal");
@@ -290,10 +287,16 @@
 	CREATE_SV_ICON (sv_public_func_t,       "Icons.16x16.InternalMethod");
 	CREATE_SV_ICON (sv_public_var_t,        "Icons.16x16.InternalProperty");
 	
-	sv_symbol_pixbufs[sv_cfolder_t] = gdl_icons_get_mime_icon (icon_set,
-							    "application/directory-normal");
-	sv_symbol_pixbufs[sv_ofolder_t] = gdl_icons_get_mime_icon (icon_set,
-							    "application/directory-normal");
+	sv_symbol_pixbufs[sv_cfolder_t] = gtk_icon_theme_load_icon (gtk_icon_theme_get_default(),
+																GTK_STOCK_DIRECTORY,
+																ICON_SIZE,
+																GTK_ICON_LOOKUP_GENERIC_FALLBACK,
+																NULL);
+	sv_symbol_pixbufs[sv_ofolder_t] = gtk_icon_theme_load_icon (gtk_icon_theme_get_default(),
+																GTK_STOCK_DIRECTORY,
+																ICON_SIZE,
+																GTK_ICON_LOOKUP_GENERIC_FALLBACK,
+																NULL);
 	sv_symbol_pixbufs[sv_max_t] = NULL;
 }
 

Modified: trunk/plugins/symbol-browser/an_symbol_view.c
==============================================================================
--- trunk/plugins/symbol-browser/an_symbol_view.c	(original)
+++ trunk/plugins/symbol-browser/an_symbol_view.c	Tue Sep  2 08:23:30 2008
@@ -36,6 +36,7 @@
 #include <libanjuta/anjuta-debug.h>
 #include <libanjuta/anjuta-status.h>
 #include <tm_tagmanager.h>
+#include <tm_symbol.h>
 #include "an_symbol_view.h"
 #include "an_symbol_info.h"
 #include "an_symbol_prefs.h"
@@ -456,7 +457,6 @@
 		/* Symbol has been created, no need to create them again */
 		if (sym)
 		{
-			g_object_unref (sym);
 			return;
 		}
 	}
@@ -489,7 +489,6 @@
 	if (sym)
 	{
 		anjuta_symbol_view_add_children (sv, sym, store, iter);
-		g_object_unref (sym);
 	}
 
 	/* Delete the referenced rows */