[seahorse-nautilus] Use GtkComboBoxText correctly
- From: Stefan Walter <stefw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [seahorse-nautilus] Use GtkComboBoxText correctly
- Date: Fri, 29 Jun 2012 07:36:37 +0000 (UTC)
commit 8abff8e3e7592bb85a6e1466afb5e68ca0ca9de4
Author: Stef Walter <stefw gnome org>
Date: Fri Jun 29 08:45:48 2012 +0200
Use GtkComboBoxText correctly
* And remove check for old versions of GTK+
tool/seahorse-multi-encrypt.xml | 2 +-
tool/seahorse-tool-files.c | 8 --------
2 files changed, 1 insertions(+), 9 deletions(-)
---
diff --git a/tool/seahorse-multi-encrypt.xml b/tool/seahorse-multi-encrypt.xml
index ff6901e..4390ca2 100644
--- a/tool/seahorse-multi-encrypt.xml
+++ b/tool/seahorse-multi-encrypt.xml
@@ -55,7 +55,7 @@
</packing>
</child>
<child>
- <object class="GtkComboBox" id="package-extension">
+ <object class="GtkComboBoxText" id="package-extension">
<property name="visible">True</property>
</object>
<packing>
diff --git a/tool/seahorse-tool-files.c b/tool/seahorse-tool-files.c
index 1f8a404..37148c8 100644
--- a/tool/seahorse-tool-files.c
+++ b/tool/seahorse-tool-files.c
@@ -432,11 +432,7 @@ prepare_dialog (FilesCtx *ctx, guint nfolders, guint nfiles, GFileInfo *info, gc
save_type_list = save_type;
for (i = 0; save_type_list[i] != FR_FILE_TYPE_NULL; i++) {
-#if GTK_CHECK_VERSION(2,23,0)
gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo),
-#else
- gtk_combo_box_append_text (GTK_COMBO_BOX (combo),
-#endif
file_type_desc[save_type_list[i]].ext);
if (strcmp(ext, file_type_desc[save_type_list[i]].ext) == 0)
gtk_combo_box_set_active (GTK_COMBO_BOX (combo), i);
@@ -477,11 +473,7 @@ get_results (SeahorseWidget *swidget)
name = gtk_entry_get_text (GTK_ENTRY (w));
w = GTK_WIDGET (seahorse_widget_get_widget (swidget, "package-extension"));
-#if GTK_CHECK_VERSION(2,23,0)
ext = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT (w));
-#else
- ext = gtk_combo_box_get_active_text (GTK_COMBO_BOX (w));
-#endif
/* No paths */
t = strrchr(name, '/');
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]