anjuta r3648 - in trunk: . libanjuta src

[jhs svn gnome org]

Author: jhs
Date: Wed Feb 13 13:25:38 2008
New Revision: 3648
URL: http://svn.gnome.org/viewvc/anjuta?rev=3648&view=rev

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

	* libanjuta/anjuta-launcher.c: (anjuta_launcher_set_encoding_real),
	(anjuta_launcher_set_encoding), (anjuta_launcher_fork):
	* libanjuta/anjuta-launcher.h:
	Some more fixes from symbol-db-branch
	
	* src/Makefile.am:
	Move anjuta-shell to noinst_PROGRAMS as it is just a test

Modified:
   trunk/ChangeLog
   trunk/libanjuta/anjuta-launcher.c
   trunk/libanjuta/anjuta-launcher.h
   trunk/src/Makefile.am

Modified: trunk/libanjuta/anjuta-launcher.c
==============================================================================
--- trunk/libanjuta/anjuta-launcher.c	(original)
+++ trunk/libanjuta/anjuta-launcher.c	Wed Feb 13 13:25:38 2008
@@ -1037,29 +1037,15 @@
 	anjuta_launcher_synchronize (launcher);
 }
 
-/**
- * anjuta_launcher_set_encoding:
- * @launcher: a #AnjutaLancher object.
- * @charset: Character set to use for Input/Output with the process.
- * 
- * Sets the character set to use for Input/Output with the process.
- *
- * Return value: TRUE if successful, otherwise FALSE.
- */
-gboolean
-anjuta_launcher_set_encoding (AnjutaLauncher *launcher, const gchar *charset)
+
+static gboolean
+anjuta_launcher_set_encoding_real (AnjutaLauncher *launcher, const gchar *charset)
 {
 	GIOStatus s;
 	gboolean r = TRUE;
 
 	g_return_val_if_fail (launcher != NULL, FALSE);
 	// charset can be NULL
-
-	launcher->priv->custom_encoding = TRUE;
-	if (charset)
-	  launcher->priv->encoding = g_strdup(charset);
-	else
-	  launcher->priv->encoding = NULL;
 		
 	s = g_io_channel_set_encoding (launcher->priv->stderr_channel, charset, NULL);
 	if (s != G_IO_STATUS_NORMAL) r = FALSE;
@@ -1075,6 +1061,28 @@
 	return r;
 }
 
+
+/**
+ * anjuta_launcher_set_encoding:
+ * @launcher: a #AnjutaLancher object.
+ * @charset: Character set to use for Input/Output with the process.
+ * 
+ * Sets the character set to use for Input/Output with the process.
+ *
+ */
+void
+anjuta_launcher_set_encoding (AnjutaLauncher *launcher, const gchar *charset)
+{
+	if (launcher->priv->custom_encoding)
+		g_free (launcher->priv->encoding);
+	
+	launcher->priv->custom_encoding = (charset != NULL);
+	if (charset)
+	  launcher->priv->encoding = g_strdup(charset);
+	else
+	  launcher->priv->encoding = NULL;		
+}
+
 static pid_t
 anjuta_launcher_fork (AnjutaLauncher *launcher, gchar *const args[])
 {
@@ -1155,7 +1163,7 @@
 
 	if (!launcher->priv->custom_encoding)
 	  g_get_charset ((const gchar**)&launcher->priv->encoding);
-	anjuta_launcher_set_encoding (launcher, launcher->priv->encoding);
+	anjuta_launcher_set_encoding_real (launcher, launcher->priv->encoding);
 	
 	tcgetattr(pty_master_fd, &termios_flags);
 	termios_flags.c_iflag &= ~(IGNPAR | INPCK | INLCR | IGNCR | ICRNL | IXON |

Modified: trunk/libanjuta/anjuta-launcher.h
==============================================================================
--- trunk/libanjuta/anjuta-launcher.h	(original)
+++ trunk/libanjuta/anjuta-launcher.h	Wed Feb 13 13:25:38 2008
@@ -87,7 +87,7 @@
 									gchar *const argv[],
 									AnjutaLauncherOutputCallback callback,
 									gpointer callback_data);
-gboolean anjuta_launcher_set_encoding (AnjutaLauncher *launcher,
+void anjuta_launcher_set_encoding (AnjutaLauncher *launcher,
 									   const gchar *charset);
 void anjuta_launcher_send_stdin (AnjutaLauncher *launcher,
 								 const gchar *input_str);

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Wed Feb 13 13:25:38 2008
@@ -4,7 +4,7 @@
 anjuta_glade_DATA = anjuta.glade
 
 anjuta_uidir = $(anjuta_ui_dir)
-anjuta_ui_DATA = anjuta.ui anjuta-shell.ui
+anjuta_ui_DATA = anjuta.ui
 
 anjuta_layoutdir = $(anjuta_data_dir)
 anjuta_layout_DATA = layout.xml
@@ -29,7 +29,7 @@
 
 include $(top_srcdir)/plugins/editor/scintilla/lexers.make
 
-bin_PROGRAMS = anjuta anjuta-shell
+bin_PROGRAMS = anjuta
 
 anjuta_SOURCES = \
 	about.c \
@@ -55,12 +55,15 @@
 prefs_glade_files = anjuta.glade
 include $(top_srcdir)/scripts/build-schemas.mk
 
+noinst_PROGRAMS =  anjuta-shell
+
 anjuta_shell_SOURCES = shell.c shell.h
 anjuta_shell_LDADD =  \
 	$(top_builddir)/libanjuta/libanjuta.la
 
 EXTRA_DIST = \
 	$(anjuta_ui_DATA) \
+	anjuta-shell.ui \
 	$(anjuta_layout_DATA) \
 	$(anjuta_glade_DATA) \
 	$(anjuta_pixmaps_DATA)