Merge pull request #699 from andreasb242/master

Small fixes

src/gui/GladeGui.cpp

@@ -24,6 +24,12 @@ GladeGui::GladeGui(GladeSearchpath* gladeSearchPath, string glade, string mainWn
 	if (!gtk_builder_add_from_file(builder, filename.c_str(), &error))
 	{
 		string msg = FS(_F("Error loading glade file \"{1}\" (try to load \"{2}\")") % glade % filename);
+
+		if (error != NULL)
+		{
+			msg += "\n";
+			msg += error->message;
+		}
 		XojMsgBox::showErrorToUser(NULL, msg);
 
 		g_error_free(error);

src/gui/toolbarMenubar/AbstractToolItem.cpp

@@ -19,11 +19,7 @@ AbstractToolItem::~AbstractToolItem()
 {
 	XOJ_CHECK_TYPE(AbstractToolItem);
 
-	if (this->item)
-	{
-		g_object_unref(G_OBJECT(this->item));
-		this->item = NULL;
-	}
+	this->item = NULL;
 	if (this->popupMenu)
 	{
 		g_object_unref(G_OBJECT(this->popupMenu));

ui/settings.glade

@@ -1559,6 +1559,21 @@ they are not blocking!&lt;/i&gt;</property>
                             <property name="top_attach">2</property>
                           </packing>
                         </child>
+                        <child>
+                          <object class="GtkCheckButton" id="cbDarkTheme">
+                            <property name="label" translatable="yes">Dark Theme (restart needed)</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="xalign">0</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">3</property>
+                            <property name="width">2</property>
+                          </packing>
+                        </child>
                       </object>
                       <packing>
                         <property name="expand">True</property>
@@ -1866,21 +1881,6 @@ they are not blocking!&lt;/i&gt;</property>
                             <property name="fill">True</property>
                             <property name="position">0</property>
                           </packing>
-                          </child>
-                          <child>
-                          <object class="GtkCheckButton" id="cbDarkTheme">
-                            <property name="label" translatable="yes">Dark Theme (restart needed)</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="xalign">0</property>
-                            <property name="draw_indicator">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
                         </child>
                       </object>
                       <packing>