X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkprintsettings.h;h=294dabd73c79d5590e25dd264892d11ea5dc856e;hb=cf216d780cb2c889a3bcb5faa825fc1b21af8896;hp=02b6073466ad8d6393401f1de83fefa6b3a6e098;hpb=14f12a4b1b45f57c6cae0fa7f376be086d4a722f;p=~andy%2Fgtk

diff --git a/gtk/gtkprintsettings.h b/gtk/gtkprintsettings.h
index 02b607346..294dabd73 100644
--- a/gtk/gtkprintsettings.h
+++ b/gtk/gtkprintsettings.h
@@ -13,18 +13,16 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_PRINT_SETTINGS_H__
+#define __GTK_PRINT_SETTINGS_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_PRINT_SETTINGS_H__
-#define __GTK_PRINT_SETTINGS_H__
-
 #include <gtk/gtkpapersize.h>
 
 G_BEGIN_DECLS
@@ -71,7 +69,7 @@ void              gtk_print_settings_to_key_file             (GtkPrintSettings
 							      const gchar          *group_name);
 gboolean          gtk_print_settings_has_key                 (GtkPrintSettings     *settings,
 							      const gchar          *key);
-G_CONST_RETURN gchar *gtk_print_settings_get                 (GtkPrintSettings     *settings,
+const gchar *     gtk_print_settings_get                     (GtkPrintSettings     *settings,
 							      const gchar          *key);
 void              gtk_print_settings_set                     (GtkPrintSettings     *settings,
 							      const gchar          *key,
@@ -136,6 +134,8 @@ void              gtk_print_settings_set_int                 (GtkPrintSettings
 #define GTK_PRINT_SETTINGS_RESOLUTION_X     "resolution-x"
 #define GTK_PRINT_SETTINGS_RESOLUTION_Y     "resolution-y"
 #define GTK_PRINT_SETTINGS_PRINTER_LPI      "printer-lpi"
+#define GTK_PRINT_SETTINGS_OUTPUT_DIR       "output-dir"
+#define GTK_PRINT_SETTINGS_OUTPUT_BASENAME  "output-basename"
 
 /**
  * GTK_PRINT_SETTINGS_OUTPUT_FILE_FORMAT:
@@ -159,7 +159,7 @@ void              gtk_print_settings_set_int                 (GtkPrintSettings
 
 /* Helpers: */
 
-G_CONST_RETURN gchar *gtk_print_settings_get_printer           (GtkPrintSettings   *settings);
+const gchar *         gtk_print_settings_get_printer           (GtkPrintSettings   *settings);
 void                  gtk_print_settings_set_printer           (GtkPrintSettings   *settings,
 								const gchar        *printer);
 GtkPageOrientation    gtk_print_settings_get_orientation       (GtkPrintSettings   *settings);
@@ -227,19 +227,19 @@ void                  gtk_print_settings_set_page_ranges       (GtkPrintSettings
 GtkPageSet            gtk_print_settings_get_page_set          (GtkPrintSettings   *settings);
 void                  gtk_print_settings_set_page_set          (GtkPrintSettings   *settings,
 								GtkPageSet          page_set);
-G_CONST_RETURN gchar *gtk_print_settings_get_default_source    (GtkPrintSettings   *settings);
+const gchar *         gtk_print_settings_get_default_source    (GtkPrintSettings   *settings);
 void                  gtk_print_settings_set_default_source    (GtkPrintSettings   *settings,
 								const gchar        *default_source);
-G_CONST_RETURN gchar *gtk_print_settings_get_media_type        (GtkPrintSettings   *settings);
+const gchar *         gtk_print_settings_get_media_type        (GtkPrintSettings   *settings);
 void                  gtk_print_settings_set_media_type        (GtkPrintSettings   *settings,
 								const gchar        *media_type);
-G_CONST_RETURN gchar *gtk_print_settings_get_dither            (GtkPrintSettings   *settings);
+const gchar *         gtk_print_settings_get_dither            (GtkPrintSettings   *settings);
 void                  gtk_print_settings_set_dither            (GtkPrintSettings   *settings,
 								const gchar        *dither);
-G_CONST_RETURN gchar *gtk_print_settings_get_finishings        (GtkPrintSettings   *settings);
+const gchar *         gtk_print_settings_get_finishings        (GtkPrintSettings   *settings);
 void                  gtk_print_settings_set_finishings        (GtkPrintSettings   *settings,
 								const gchar        *finishings);
-G_CONST_RETURN gchar *gtk_print_settings_get_output_bin        (GtkPrintSettings   *settings);
+const gchar *         gtk_print_settings_get_output_bin        (GtkPrintSettings   *settings);
 void                  gtk_print_settings_set_output_bin        (GtkPrintSettings   *settings,
 								const gchar        *output_bin);