[gtk+] print: Make things compile again
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] print: Make things compile again
- Date: Mon, 18 Oct 2010 17:26:16 +0000 (UTC)
commit 3b8a264a5efbd2509d1286c9c367ec181cf34356
Author: Benjamin Otte <otte redhat com>
Date: Mon Oct 18 19:01:55 2010 +0200
print: Make things compile again
Remove workaround for entries - the general codepath should just work.
gtk/gtkprinteroptionwidget.c | 15 ++++-----------
1 files changed, 4 insertions(+), 11 deletions(-)
---
diff --git a/gtk/gtkprinteroptionwidget.c b/gtk/gtkprinteroptionwidget.c
index 8349d2c..28cc5bf 100644
--- a/gtk/gtkprinteroptionwidget.c
+++ b/gtk/gtkprinteroptionwidget.c
@@ -372,18 +372,11 @@ combo_box_get (GtkWidget *combo)
gchar *value;
GtkTreeIter iter;
- if (gtk_combo_box_get_has_entry (GTK_COMBO_BOX (combo)))
- {
- value = gtk_combo_box_get_active_text(GTK_COMBO_BOX (combo));
- }
- else
- {
- model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo));
+ model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo));
- value = NULL;
- if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (combo), &iter))
- gtk_tree_model_get (model, &iter, VALUE_COLUMN, &value, -1);
- }
+ value = NULL;
+ if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (combo), &iter))
+ gtk_tree_model_get (model, &iter, VALUE_COLUMN, &value, -1);
return value;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]