change return value and local variable to const gchar* to fix warning

2008-04-18  Michael Natterer  <mitch@imendio.com>

	* modules/printbackends/cups/gtkprintercups.[ch]
	(gtk_printer_cups_get_ppd_name): change return value and local
	variable to const gchar* to fix warning about discarding const
	qualifier.

svn path=/trunk/; revision=20021

diff --git a/ChangeLog b/ChangeLog
index 14d9c83d77504cacb55ba00173fe737057e63625..f6c5cdccb7ef5e171efa79215ea06398464c3c0d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-04-18  Michael Natterer  <mitch@imendio.com>
+
+       * modules/printbackends/cups/gtkprintercups.[ch]
+       (gtk_printer_cups_get_ppd_name): change return value and local
+       variable to const gchar* to fix warning about discarding const
+       qualifier.
+
 2008-04-18  Emmanuele Bassi  <ebassi@gnome.org>
 
        * gtk/gtkrecentmanager.c:

diff --git a/modules/printbackends/cups/gtkprintercups.c b/modules/printbackends/cups/gtkprintercups.c
index 21ae2c6837e4ba38cf851a6aac1aacf9a2791e2c..e54361957b64da0f23726d2b4dc0b363a5ebf91c 100644 (file)
--- a/modules/printbackends/cups/gtkprintercups.c
+++ b/modules/printbackends/cups/gtkprintercups.c
@@ -127,10 +127,10 @@ gtk_printer_cups_get_ppd (GtkPrinterCups *printer)
   return printer->ppd_file;
 }
 
-char *
+const gchar *
 gtk_printer_cups_get_ppd_name (GtkPrinterCups  *printer)
 {
-  gchar *result;
+  const gchar *result;
 
   result = printer->ppd_name;
 
@@ -139,4 +139,3 @@ gtk_printer_cups_get_ppd_name (GtkPrinterCups  *printer)
 
   return result;
 }
-

diff --git a/modules/printbackends/cups/gtkprintercups.h b/modules/printbackends/cups/gtkprintercups.h
index d33a5ab5ebf3927b65aaf0c6fad399f7ad49cfde..7e2734703f277b150f8a4d9766c465e20f700b9c 100644 (file)
--- a/modules/printbackends/cups/gtkprintercups.h
+++ b/modules/printbackends/cups/gtkprintercups.h
@@ -16,10 +16,10 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+
 #ifndef __GTK_PRINTER_CUPS_H__
 #define __GTK_PRINTER_CUPS_H__
 
-#include <glib.h>
 #include <glib-object.h>
 #include <cups/cups.h>
 #include <cups/ppd.h>
@@ -65,7 +65,7 @@ void                     gtk_printer_cups_register_type (GTypeModule     *module
 GtkPrinterCups          *gtk_printer_cups_new           (const char      *name,
                                                         GtkPrintBackend *backend);
 ppd_file_t             *gtk_printer_cups_get_ppd       (GtkPrinterCups  *printer);
-char                   *gtk_printer_cups_get_ppd_name  (GtkPrinterCups  *printer);
+const gchar            *gtk_printer_cups_get_ppd_name  (GtkPrinterCups  *printer);
 
 G_END_DECLS