summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2008-02-06 04:06:47 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2008-02-06 04:06:47 +0000
commite19fe1750f5dde3a69f14d39b23a789917ad2966 (patch)
tree676f8571f8c2ec8c3b10ca5faf5ee99dc2de7ecd
parent1b4619a1ab43051a9a3c17b507b368147e53574a (diff)
downloadgdk-pixbuf-e19fe1750f5dde3a69f14d39b23a789917ad2966.tar.gz
Allow to store half-open ranges.
2008-02-05 Matthias Clasen <mclasen@redhat.com> * gtk/gtkprintsettings.c (gtk_print_settings_get_page_ranges): Allow to store half-open ranges. svn path=/branches/gtk-2-12/; revision=19480
-rw-r--r--ChangeLog7
-rw-r--r--gtk/gtkprintsettings.c2
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index e2ed4da00..8e842d30f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-02-05 Matthias Clasen <mclasen@redhat.com>
+
+ Merge from trunk:
+
+ * gtk/gtkprintsettings.c (gtk_print_settings_get_page_ranges):
+ Allow to store half-open ranges.
+
2008-02-05 Federico Mena Quintero <federico@novell.com>
Don't focus the file list when shortcuts get activated. This
diff --git a/gtk/gtkprintsettings.c b/gtk/gtkprintsettings.c
index 321bc7c5b..6957bdfca 100644
--- a/gtk/gtkprintsettings.c
+++ b/gtk/gtkprintsettings.c
@@ -1283,8 +1283,6 @@ gtk_print_settings_get_page_ranges (GtkPrintSettings *settings,
{
str++;
end = (gint)strtol (str, NULL, 10);
- if (end < start)
- end = start;
}
ranges[i].start = start;