46 lines
1.7 KiB
Diff
46 lines
1.7 KiB
Diff
From 39e6c8420e0016cbc2a60ec7d431b0a6aec30496 Mon Sep 17 00:00:00 2001
|
|
From: Mamoru TASAKA <mtasaka@fedoraproject.org>
|
|
Date: Thu, 21 May 2015 19:49:04 +0900
|
|
Subject: [PATCH] make libfm-pref-apps work with GTK 3.10+
|
|
|
|
Use gtk_builder_new_from_file supported on GTK 3.10+.
|
|
has_separator property is no longer supported so just
|
|
drop this.
|
|
---
|
|
data/ui/preferred-apps.glade | 1 -
|
|
src/tools/libfm-pref-apps.c | 4 ++++
|
|
2 files changed, 4 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/data/ui/preferred-apps.glade b/data/ui/preferred-apps.glade
|
|
index 84f26b5..327cb63 100644
|
|
--- a/data/ui/preferred-apps.glade
|
|
+++ b/data/ui/preferred-apps.glade
|
|
@@ -7,7 +7,6 @@
|
|
<property name="title" translatable="yes">Preferred Applications</property>
|
|
<property name="window_position">center</property>
|
|
<property name="type_hint">normal</property>
|
|
- <property name="has_separator">False</property>
|
|
<child internal-child="vbox">
|
|
<object class="GtkVBox" id="dialog-vbox1">
|
|
<property name="visible">True</property>
|
|
diff --git a/src/tools/libfm-pref-apps.c b/src/tools/libfm-pref-apps.c
|
|
index 584b587..dbdb59b 100644
|
|
--- a/src/tools/libfm-pref-apps.c
|
|
+++ b/src/tools/libfm-pref-apps.c
|
|
@@ -47,8 +47,12 @@ int main(int argc, char** argv)
|
|
gtk_init(&argc, &argv);
|
|
fm_gtk_init(NULL);
|
|
|
|
+#if GTK_CHECK_VERSION(3, 10, 0)
|
|
+ b = gtk_builder_new_from_file(PACKAGE_UI_DIR "/preferred-apps.ui");
|
|
+#else
|
|
b = gtk_builder_new();
|
|
gtk_builder_add_from_file(b, PACKAGE_UI_DIR "/preferred-apps.ui", NULL);
|
|
+#endif
|
|
dlg = GTK_DIALOG(gtk_builder_get_object(b, "dlg"));
|
|
browser = GTK_COMBO_BOX(gtk_builder_get_object(b, "browser"));
|
|
mail_client = GTK_COMBO_BOX(gtk_builder_get_object(b, "mail_client"));
|
|
--
|
|
2.1.0
|
|
|