gtksourceview r2242 - in branches/gtksourcecompletion: . gtksourceview

[icq svn gnome org]

Author: icq
Date: Tue Apr  7 15:39:36 2009
New Revision: 2242
URL: http://svn.gnome.org/viewvc/gtksourceview?rev=2242&view=rev

Log:
2009-04-07  Ignacio Casal Quinteiro  <nacho resa gmail com>

        * gtksourceview/gtksourcecompletion.c:
        * gtksourceview/gtksourcecompletioninfo.c:
        * gtksourceview/gtksourcecompletionproposal.c:
        Make the new files compile with the gtksourceview ones.



Modified:
   branches/gtksourcecompletion/ChangeLog
   branches/gtksourcecompletion/gtksourceview/gtksourcecompletion.c
   branches/gtksourcecompletion/gtksourceview/gtksourcecompletioninfo.c
   branches/gtksourcecompletion/gtksourceview/gtksourcecompletionproposal.c

Modified: branches/gtksourcecompletion/gtksourceview/gtksourcecompletion.c
==============================================================================
--- branches/gtksourcecompletion/gtksourceview/gtksourcecompletion.c	(original)
+++ branches/gtksourcecompletion/gtksourceview/gtksourcecompletion.c	Tue Apr  7 15:39:36 2009
@@ -33,10 +33,9 @@
 #include "gtksourcecompletionutils.h"
 #include "gtksourceview-marshal.h"
 #include "gtksourcecompletion.h"
+#include "gtksourceview-i18n.h"
 #include <string.h>
 
-static gboolean lib_initialized = FALSE;
-
 #define WINDOW_WIDTH 350
 #define WINDOW_HEIGHT 200
 
@@ -1312,7 +1311,7 @@
 			      G_STRUCT_OFFSET (GtkSourceCompletionClass, proposal_selected),
 			      g_signal_accumulator_true_handled, 
 			      NULL,
-			      gtksourcecompletion_marshal_BOOLEAN__POINTER, 
+			      _gtksourceview_marshal_BOOLEAN__POINTER, 
 			      G_TYPE_BOOLEAN,
 			      1,
 			      GTK_TYPE_POINTER);
@@ -1331,7 +1330,7 @@
 			      G_STRUCT_OFFSET (GtkSourceCompletionClass, display_info),
 			      g_signal_accumulator_true_handled, 
 			      NULL,
-			      gtksourcecompletion_marshal_BOOLEAN__POINTER,
+			      _gtksourceview_marshal_BOOLEAN__POINTER,
 			      G_TYPE_BOOLEAN,
 			      1,
 			      GTK_TYPE_POINTER);
@@ -1346,13 +1345,6 @@
 	GtkWidget *prev_page_icon;
 	GtkWidget *vbox;
 
-	if (!lib_initialized)
-	{
-		bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
-		bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-		lib_initialized = TRUE;
-	}
-
 	self->priv = GTK_SOURCE_COMPLETION_GET_PRIVATE (self);
 	self->priv->destroy_has_run = FALSE;
 	self->priv->active_trigger = NULL;

Modified: branches/gtksourcecompletion/gtksourceview/gtksourcecompletioninfo.c
==============================================================================
--- branches/gtksourcecompletion/gtksourceview/gtksourcecompletioninfo.c	(original)
+++ branches/gtksourcecompletion/gtksourceview/gtksourcecompletioninfo.c	Tue Apr  7 15:39:36 2009
@@ -30,7 +30,7 @@
   
 #include "gtksourcecompletioninfo.h"
 #include "gtksourcecompletionutils.h"
-#include "gtksourcecompletioni18n.h"
+#include "gtksourceview-i18n.h"
 
 struct _GtkSourceCompletionInfoPrivate
 {

Modified: branches/gtksourcecompletion/gtksourceview/gtksourcecompletionproposal.c
==============================================================================
--- branches/gtksourcecompletion/gtksourceview/gtksourcecompletionproposal.c	(original)
+++ branches/gtksourcecompletion/gtksourceview/gtksourcecompletionproposal.c	Tue Apr  7 15:39:36 2009
@@ -31,8 +31,7 @@
   
 #include "gtksourcecompletionproposal.h"
 #include "gtksourcecompletionutils.h"
-#include "gtksourcecompletionmarshal.h"
-#include "gtksourcecompletioni18n.h"
+#include "gtksourceview-i18n.h"
 
 #define GTK_SOURCE_COMPLETION_PROPOSAL_DEFAULT_PAGE _("Default")
 #define GTK_SOURCE_COMPLETION_PROPOSAL_DEFAULT_PRIORITY 10