Updating branch refs/heads/jeromeg/settings-editor
to 3b71aafb6124db3e418478c12313a42a6104383c (commit)
from ec044e0f5a72cf0b9b2715793a0edb96d9dd9d94 (commit)
commit 3b71aafb6124db3e418478c12313a42a6104383c
Author: Jérôme Guelfucci <[email protected]>
Date: Sun Jan 10 00:13:36 2010 +0100
Remove some code which is not needed since builder is not global
anymore.
xfce4-settings-editor/main_window.c | 25 +++++++++----------------
1 files changed, 9 insertions(+), 16 deletions(-)
diff --git a/xfce4-settings-editor/main_window.c
b/xfce4-settings-editor/main_window.c
index 52eed12..d4457d1 100644
--- a/xfce4-settings-editor/main_window.c
+++ b/xfce4-settings-editor/main_window.c
@@ -107,22 +107,15 @@ xfce4_settings_editor_main_window_new(void)
GtkTreeSelection *selection;
GObject *property_edit_button, *property_new_button,
*property_revert_button;
- if (!builder)
- {
- /* hook to make sure the libxfce4ui library is linked */
- if (xfce_titled_dialog_get_type () == 0)
- return NULL;
+ /* hook to make sure the libxfce4ui library is linked */
+ if (xfce_titled_dialog_get_type () == 0)
+ return NULL;
- builder = gtk_builder_new ();
- gtk_builder_add_from_string (builder, xfce4_settings_editor_ui,
xfce4_settings_editor_ui_length, NULL);
+ builder = gtk_builder_new ();
+ gtk_builder_add_from_string (builder, xfce4_settings_editor_ui,
xfce4_settings_editor_ui_length, NULL);
- dialog = gtk_builder_get_object (builder, "main_dialog");
- g_object_weak_ref (G_OBJECT (dialog), (GWeakNotify) g_object_unref,
builder);
- }
- else
- {
- dialog = gtk_builder_get_object (builder, "main_dialog");
- }
+ dialog = gtk_builder_get_object (builder, "main_dialog");
+ g_object_weak_ref (G_OBJECT (dialog), (GWeakNotify) g_object_unref,
builder);
gtk_widget_add_events (GTK_WIDGET (dialog), GDK_KEY_PRESS_MASK);
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
