anjuta r4676 - in trunk: . manuals/anjuta-manual manuals/anjuta-manual/C plugins/glade

[jhs svn gnome org]

Author: jhs
Date: Sun Feb  1 23:31:38 2009
New Revision: 4676
URL: http://svn.gnome.org/viewvc/anjuta?rev=4676&view=rev

Log:
2009-02-02   Pavel Kostyuchenko  <ShprotX gmail com>

	* manuals/anjuta-manual/C/anjuta-manual.xml:
	* manuals/anjuta-manual/Makefile.am:
	* plugins/glade/plugin.c (set_default_resource_target),
	(on_default_resource_target_changed), (ipreferences_unmerge):
	Glade manual and misc fixes:
	542412 â GSoc: Glade3 integration

Modified:
   trunk/ChangeLog
   trunk/manuals/anjuta-manual/C/anjuta-manual.xml
   trunk/manuals/anjuta-manual/Makefile.am
   trunk/plugins/glade/plugin.c

Modified: trunk/manuals/anjuta-manual/C/anjuta-manual.xml
==============================================================================
--- trunk/manuals/anjuta-manual/C/anjuta-manual.xml	(original)
+++ trunk/manuals/anjuta-manual/C/anjuta-manual.xml	Sun Feb  1 23:31:38 2009
@@ -9,6 +9,7 @@
   <!ENTITY projects SYSTEM "projects.xml">
   <!ENTITY build SYSTEM "build.xml">
   <!ENTITY debugger SYSTEM "debugger.xml">
+  <!ENTITY glade SYSTEM "glade.xml">
   <!ENTITY preferences SYSTEM "preferences.xml">
   <!ENTITY tools SYSTEM "tools.xml">
   <!ENTITY authors SYSTEM "authors.xml">
@@ -101,6 +102,8 @@
  &build;
  <!-- Debugging -->
  &debugger;
+ <!-- Glade Interface Designer -->
+ &glade;
  <!-- Preferences -->
  &preferences;
  <!-- Tools -->

Modified: trunk/manuals/anjuta-manual/Makefile.am
==============================================================================
--- trunk/manuals/anjuta-manual/Makefile.am	(original)
+++ trunk/manuals/anjuta-manual/Makefile.am	Sun Feb  1 23:31:38 2009
@@ -4,7 +4,8 @@
 DOC_ENTITIES = legal.xml debugger.xml introduction.xml  projects.xml \
 	authors.xml legal.xml template.xml \
 	fileoperations.xml license.xml tools.xml \
-	interface.xml preferences.xml build.xml
+	interface.xml preferences.xml build.xml \
+	glade.xml
 DOC_AM_CPPFLAGS =
 DOC_FIGURES = figures/add_edit_macro.png \
               figures/anjuta-in-action.png \

Modified: trunk/plugins/glade/plugin.c
==============================================================================
--- trunk/plugins/glade/plugin.c	(original)
+++ trunk/plugins/glade/plugin.c	Sun Feb  1 23:31:38 2009
@@ -3841,7 +3841,10 @@
 set_default_resource_target (const gchar *value, GladePlugin* plugin)
 {
 	g_free (plugin->priv->default_resource_target);
-	plugin->priv->default_resource_target = g_strdup (value);
+	if (!value || strlen (value) == 0)
+		plugin->priv->default_resource_target = NULL;
+	else
+		plugin->priv->default_resource_target = g_strdup (value);
 	on_default_resource_target_changed (value, plugin);
 }
 
@@ -5041,7 +5044,7 @@
 
 	entry = GTK_ENTRY(gtk_builder_get_object (plugin->priv->xml,
 	                                          DEFAULT_RESOURCE_ENTRY_NAME));
-	gtk_entry_set_text (entry, value);
+	gtk_entry_set_text (entry, value ? value : "");
 }
 
 static void
@@ -5069,7 +5072,6 @@
 static void
 ipreferences_unmerge (IAnjutaPreferences* ipref, AnjutaPreferences* prefs, GError** e)
 {
-	GObject *object;
 	GtkWidget *page;
 	GladePlugin* plugin = ANJUTA_PLUGIN_GLADE (ipref);
 
@@ -5078,25 +5080,6 @@
 	/* Stops watching for preferences */
 	plugin->priv->prefs = NULL;
 
-	object = gtk_builder_get_object (plugin->priv->xml, HANDLER_TEMPLATE_BUTTON0_NAME);
-	g_signal_handlers_disconnect_by_func (object,
-	                                      G_CALLBACK(on_set_default_data_signal_template0),
-	                                      plugin);
-	object = gtk_builder_get_object (plugin->priv->xml, HANDLER_TEMPLATE_BUTTON1_NAME);
-	g_signal_handlers_disconnect_by_func (object,
-	                                      G_CALLBACK(on_set_default_data_signal_template1),
-	                                      plugin);
-
-	object = gtk_builder_get_object (plugin->priv->xml, INSERT_HANDLER_ON_EDIT_NAME);
-	g_signal_handlers_disconnect_by_func (object,
-	                                      G_CALLBACK(on_insert_handler_on_edit_toggled),
-	                                      plugin);
-	on_insert_handler_on_edit_changed (plugin);
-
-	object = gtk_builder_get_object (plugin->priv->xml, AUTO_ADD_RESOURCE_NAME);
-	g_signal_handlers_disconnect_by_func (object,
-	                                      G_CALLBACK(on_auto_add_resource_toggled),
-	                                      plugin);
 	remove_widget_from_parent (gtk_widget_get_parent (page), page);
 
 	anjuta_preferences_remove_page(prefs, _("Glade GUI Designer"));