2007-08-21 Jim Evins <evins@snaught.com>

	* src/print-op.c: (create_custom_widget_cb):
		Fix problem with force_outline_flag -- don't override with default.

git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@672 f5e0f49d-192f-0410-a22d-a8d8700d0965

diff --git a/glabels2/ChangeLog b/glabels2/ChangeLog
index 1a72aa20ba61920e0645c77b21b5ad7a43c64732..3266fd8722bb98dd82cdf899eba31e306afe4793 100644 (file)
--- a/glabels2/ChangeLog
+++ b/glabels2/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-21  Jim Evins  <evins@snaught.com>
+
+       * src/print-op.c: (create_custom_widget_cb):
+               Fix problem with force_outline_flag -- don't override with default.
+
 2007-08-21  Jim Evins  <evins@snaught.com>
 
        * data/dtd/glabels-2.0.dtd:

diff --git a/glabels2/src/print-op.c b/glabels2/src/print-op.c
index da3902900190b5e9057ed07c360781bb517ce14d..302e54e6e303246303ef76fa613b5fe7be07d806 100644 (file)
--- a/glabels2/src/print-op.c
+++ b/glabels2/src/print-op.c
@@ -478,6 +478,14 @@ create_custom_widget_cb (GtkPrintOperation *operation,
                gtk_widget_show_all (op->priv->merge_frame);
        }
 
+        /* --- Set options --- */
+        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (op->priv->outline_check),
+                                      op->priv->outline_flag);
+        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (op->priv->reverse_check),
+                                      op->priv->reverse_flag);
+        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (op->priv->crop_marks_check),
+                                      op->priv->crop_marks_flag);
+
         /* --- Do we need to force the outline flag --- */
         if (op->priv->force_outline_flag)
         {
@@ -489,14 +497,6 @@ create_custom_widget_cb (GtkPrintOperation *operation,
                 gtk_widget_set_sensitive (op->priv->crop_marks_check, FALSE);
         }
 
-        /* --- Set options --- */
-        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (op->priv->outline_check),
-                                      op->priv->outline_flag);
-        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (op->priv->reverse_check),
-                                      op->priv->reverse_flag);
-        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (op->priv->crop_marks_check),
-                                      op->priv->crop_marks_flag);
-
        return G_OBJECT (vbox);
 }