[anjuta/gsettings-migration: 32/65] message-view Fixed some more leftovers from gsettings conversation

[Johannes Schmid <jhs src gnome org>]

commit 7c18c4f52d9071c7cff1255aecb604e066d30f4f
Author: Johannes Schmid <jhs gnome org>
Date:   Thu Oct 7 18:19:54 2010 +0200

    message-view Fixed some more leftovers from gsettings conversation

 .../message-view/anjuta-message-manager-plugin.ui  |  112 +-------------------
 plugins/message-view/plugin.c                      |    1 +
 plugins/sourceview/sourceview-prefs.c              |    4 +-
 3 files changed, 4 insertions(+), 113 deletions(-)
---
diff --git a/plugins/message-view/anjuta-message-manager-plugin.ui b/plugins/message-view/anjuta-message-manager-plugin.ui
index 1550fbd..e72921e 100644
--- a/plugins/message-view/anjuta-message-manager-plugin.ui
+++ b/plugins/message-view/anjuta-message-manager-plugin.ui
@@ -111,114 +111,6 @@
       <object class="GtkVBox" id="Messages">
         <property name="visible">True</property>
         <child>
-          <object class="GtkFrame" id="frame36">
-            <property name="border_width">5</property>
-            <property name="label_xalign">0</property>
-            <property name="shadow_type">none</property>
-            <child>
-              <object class="GtkTable" id="table18">
-                <property name="visible">True</property>
-                <property name="border_width">10</property>
-                <property name="n_rows">4</property>
-                <property name="n_columns">2</property>
-                <property name="column_spacing">5</property>
-                <property name="row_spacing">5</property>
-                <child>
-                  <object class="GtkSpinButton" id="preferences_spin:int:50:0:msgman-truncat-first">
-                    <property name="can_focus">True</property>
-                    <property name="adjustment">adjustment1</property>
-                    <property name="climb_rate">1</property>
-                    <property name="numeric">True</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="right_attach">2</property>
-                    <property name="top_attach">1</property>
-                    <property name="bottom_attach">2</property>
-                    <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkSpinButton" id="preferences_spin:int:50:0:msgman-truncat-first">
-                    <property name="can_focus">True</property>
-                    <property name="adjustment">adjustment2</property>
-                    <property name="climb_rate">1</property>
-                    <property name="numeric">True</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="right_attach">2</property>
-                    <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
-                    <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label137">
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Number of last characters to show:</property>
-                  </object>
-                  <packing>
-                    <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
-                    <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label136">
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Number of first characters to show:</property>
-                  </object>
-                  <packing>
-                    <property name="top_attach">1</property>
-                    <property name="bottom_attach">2</property>
-                    <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkCheckButton" id="preferences_toggle:bool:0:0:msgman-truncate">
-                    <property name="label" translatable="yes">Truncate long messages</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="use_underline">True</property>
-                    <property name="draw_indicator">True</property>
-                  </object>
-                  <packing>
-                    <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
-                  </packing>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-            </child>
-            <child type="label">
-              <object class="GtkLabel" id="label135">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">Messages options</property>
-                <attributes>
-                  <attribute name="weight" value="bold"/>
-                </attributes>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
           <object class="GtkFrame" id="frame37">
             <property name="visible">True</property>
             <property name="border_width">5</property>
@@ -338,7 +230,7 @@
           </object>
           <packing>
             <property name="expand">False</property>
-            <property name="position">1</property>
+            <property name="position">0</property>
           </packing>
         </child>
         <child>
@@ -426,7 +318,7 @@
           </object>
           <packing>
             <property name="expand">False</property>
-            <property name="position">2</property>
+            <property name="position">1</property>
           </packing>
         </child>
       </object>
diff --git a/plugins/message-view/plugin.c b/plugins/message-view/plugin.c
index 8042313..335cd70 100644
--- a/plugins/message-view/plugin.c
+++ b/plugins/message-view/plugin.c
@@ -583,6 +583,7 @@ ipreferences_merge(IAnjutaPreferences* ipref, AnjutaPreferences* prefs, GError**
 	{
 		g_warning ("Couldn't load builder file: %s", error->message);
 		g_error_free (error);
+		return;
 	}
 	anjuta_preferences_add_from_builder (prefs, bxml,
 									"Messages", _("Messages"),
diff --git a/plugins/sourceview/sourceview-prefs.c b/plugins/sourceview/sourceview-prefs.c
index 5cd743e..a9f3e8d 100644
--- a/plugins/sourceview/sourceview-prefs.c
+++ b/plugins/sourceview/sourceview-prefs.c
@@ -340,8 +340,7 @@ init_fonts(Sourceview* sv)
 	}
 	else
 	{
-		/* FIXME: Get font from GSettings */
-#if 0	
+		/* FIXME: Get font from GSettings */	
 		GConfClient *gclient;
 		gchar *desktop_fixed_font;
 		
@@ -354,7 +353,6 @@ init_fonts(Sourceview* sv)
 			anjuta_view_set_font(sv->priv->view, TRUE, NULL);
 		g_free (desktop_fixed_font);
 		g_object_unref (gclient);
-#endif
 	}
 }