Change some function names to be longer and better.

2006-05-31  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkprintcontext.h:
	* gtk/gtkprintcontext.c:
	* gtk/gtkprintoperation.c:
	* gtk/gtkprintoperation-unix.c: Change some function names to be
	longer and better.
	gtk_print_context_get_cairo -> gtk_print_context_get_cairo_context
	gtk_print_context_get_fontmap -> gtk_print_context_get_pango_fontmap
	gtk_print_context_create_context -> gtk_print_context_create_pango_context
	gtk_print_context_create_layout -> gtk_print_context_create_pango_layout
	Update all callers.

diff --git a/ChangeLog b/ChangeLog
index 61a1a70349f4650775e0c14c65230531554ada96..7a574bb9ff13da397bdd7ef01c731d50208911b3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2006-05-31  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkprintcontext.h: 
+       * gtk/gtkprintcontext.c: 
+       * gtk/gtkprintoperation.c: 
+       * gtk/gtkprintoperation-unix.c: Change some function names to be 
+       longer and better. 
+       gtk_print_context_get_cairo -> gtk_print_context_get_cairo_context
+       gtk_print_context_get_fontmap -> gtk_print_context_get_pango_fontmap
+       gtk_print_context_create_context -> gtk_print_context_create_pango_context
+       gtk_print_context_create_layout -> gtk_print_context_create_pango_layout
+       Update all callers.
+
        * gtk/gtkpagesetupunixdialog.c: Don't run the custom page
        size dialog.  (#340444, Christian Persch)
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 61a1a70349f4650775e0c14c65230531554ada96..7a574bb9ff13da397bdd7ef01c731d50208911b3 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,16 @@
 2006-05-31  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkprintcontext.h: 
+       * gtk/gtkprintcontext.c: 
+       * gtk/gtkprintoperation.c: 
+       * gtk/gtkprintoperation-unix.c: Change some function names to be 
+       longer and better. 
+       gtk_print_context_get_cairo -> gtk_print_context_get_cairo_context
+       gtk_print_context_get_fontmap -> gtk_print_context_get_pango_fontmap
+       gtk_print_context_create_context -> gtk_print_context_create_pango_context
+       gtk_print_context_create_layout -> gtk_print_context_create_pango_layout
+       Update all callers.
+
        * gtk/gtkpagesetupunixdialog.c: Don't run the custom page
        size dialog.  (#340444, Christian Persch)
 

diff --git a/gtk/gtkprintcontext.c b/gtk/gtkprintcontext.c
index 7464933ed40b41cfe0a2b23a02961986a7cb9872..5e68ae21732f0329df0cff5a69993b9ff0e5ed8b 100644 (file)
--- a/gtk/gtkprintcontext.c
+++ b/gtk/gtkprintcontext.c
@@ -209,7 +209,7 @@ _gtk_print_context_set_page_setup (GtkPrintContext *context,
 }
 
 /**
- * gtk_print_context_get_cairo:
+ * gtk_print_context_get_cairo_context:
  * @context: a #GtkPrintContext
  *
  * Obtains the cairo context that is associated with the
@@ -220,7 +220,7 @@ _gtk_print_context_set_page_setup (GtkPrintContext *context,
  * Since: 2.10
  */
 cairo_t *
-gtk_print_context_get_cairo (GtkPrintContext *context)
+gtk_print_context_get_cairo_context (GtkPrintContext *context)
 {
   g_return_val_if_fail (GTK_IS_PRINT_CONTEXT (context), NULL);
 
@@ -343,7 +343,7 @@ gtk_print_context_get_dpi_y (GtkPrintContext *context)
 }
 
 /**
- * gtk_print_context_get_fontmap:
+ * gtk_print_context_get_pango_fontmap:
  * @context: a #GtkPrintContext
  *
  * Returns a #PangoFontMap that is suitable for use 
@@ -354,7 +354,7 @@ gtk_print_context_get_dpi_y (GtkPrintContext *context)
  * Since: 2.10
  */
 PangoFontMap *
-gtk_print_context_get_fontmap (GtkPrintContext *context)
+gtk_print_context_get_pango_fontmap (GtkPrintContext *context)
 {
   g_return_val_if_fail (GTK_IS_PRINT_CONTEXT (context), NULL);
 
@@ -362,7 +362,7 @@ gtk_print_context_get_fontmap (GtkPrintContext *context)
 }
 
 /**
- * gtk_print_context_create_context:
+ * gtk_print_context_create_pango_context:
  * @context: a #GtkPrintContext 
  *
  * Creates a new #PangoContext that can be used with the
@@ -373,7 +373,7 @@ gtk_print_context_get_fontmap (GtkPrintContext *context)
  * Since: 2.10
  */
 PangoContext *
-gtk_print_context_create_context (GtkPrintContext *context)
+gtk_print_context_create_pango_context (GtkPrintContext *context)
 {
   PangoContext *pango_context;
 
@@ -385,7 +385,7 @@ gtk_print_context_create_context (GtkPrintContext *context)
 }
 
 /**
- * gtk_print_context_create_layout:
+ * gtk_print_context_create_pango_layout:
  * @context: a #GtkPrintContext
  *
  * Creates a new #PangoLayout that is suitable for use
@@ -396,14 +396,14 @@ gtk_print_context_create_context (GtkPrintContext *context)
  * Since: 2.10
  */
 PangoLayout *
-gtk_print_context_create_layout (GtkPrintContext *context)
+gtk_print_context_create_pango_layout (GtkPrintContext *context)
 {
   PangoContext *pango_context;
   PangoLayout *layout;
 
   g_return_val_if_fail (GTK_IS_PRINT_CONTEXT (context), NULL);
 
-  pango_context = gtk_print_context_create_context (context);
+  pango_context = gtk_print_context_create_pango_context (context);
   layout = pango_layout_new (pango_context);
 
   pango_cairo_update_context (context->cr, pango_context);

diff --git a/gtk/gtkprintcontext.h b/gtk/gtkprintcontext.h
index 30a66b9bfe7a0f9937f0ac72ab1a8b1e0ea9cb64..0ce480087fdabcb54ef13aeb7681e41fe4758573 100644 (file)
--- a/gtk/gtkprintcontext.h
+++ b/gtk/gtkprintcontext.h
@@ -38,18 +38,18 @@ GType          gtk_print_context_get_type (void) G_GNUC_CONST;
 
 
 /* Rendering */
-cairo_t *     gtk_print_context_get_cairo      (GtkPrintContext *context);
+cairo_t      *gtk_print_context_get_cairo_context    (GtkPrintContext *context);
 
-GtkPageSetup *gtk_print_context_get_page_setup (GtkPrintContext *context);
-gdouble       gtk_print_context_get_width      (GtkPrintContext *context);
-gdouble       gtk_print_context_get_height     (GtkPrintContext *context);
-gdouble       gtk_print_context_get_dpi_x      (GtkPrintContext *context);
-gdouble       gtk_print_context_get_dpi_y      (GtkPrintContext *context);
+GtkPageSetup *gtk_print_context_get_page_setup       (GtkPrintContext *context);
+gdouble       gtk_print_context_get_width            (GtkPrintContext *context);
+gdouble       gtk_print_context_get_height           (GtkPrintContext *context);
+gdouble       gtk_print_context_get_dpi_x            (GtkPrintContext *context);
+gdouble       gtk_print_context_get_dpi_y            (GtkPrintContext *context);
 
 /* Fonts */
-PangoFontMap *gtk_print_context_get_fontmap    (GtkPrintContext *context);
-PangoContext *gtk_print_context_create_context (GtkPrintContext *context);
-PangoLayout * gtk_print_context_create_layout  (GtkPrintContext *context);
+PangoFontMap *gtk_print_context_get_pango_fontmap    (GtkPrintContext *context);
+PangoContext *gtk_print_context_create_pango_context (GtkPrintContext *context);
+PangoLayout  *gtk_print_context_create_pango_layout  (GtkPrintContext *context);
 
 
 G_END_DECLS

diff --git a/gtk/gtkprintoperation-unix.c b/gtk/gtkprintoperation-unix.c
index 33354df60dac43c525759f612ee02ad26f80e181..bd2357c4604e8ee238b445eaa513e981909314c8 100644 (file)
--- a/gtk/gtkprintoperation-unix.c
+++ b/gtk/gtkprintoperation-unix.c
@@ -85,7 +85,7 @@ unix_end_page (GtkPrintOperation *op,
 {
   cairo_t *cr;
 
-  cr = gtk_print_context_get_cairo (print_context);
+  cr = gtk_print_context_get_cairo_context (print_context);
   cairo_show_page (cr);
 }
 

diff --git a/gtk/gtkprintoperation.c b/gtk/gtkprintoperation.c
index e90b81ae09458b2a6196fdfffc6d69a7ecfa7aa7..8d133aa7097f711060c09d189bee3e6d07c8ea1f 100644 (file)
--- a/gtk/gtkprintoperation.c
+++ b/gtk/gtkprintoperation.c
@@ -376,7 +376,7 @@ gtk_print_operation_class_init (GtkPrintOperationClass *class)
    *
    * Gets emitted for every page that is printed. The signal handler
    * must render the @page_nr's page onto the cairo context obtained
-   * from @context using gtk_print_context_get_cairo().
+   * from @context using gtk_print_context_get_cairo_context().
    *
    * <informalexample><programlisting>
    *  FIXME: need an example here
@@ -1413,7 +1413,7 @@ pdf_end_page (GtkPrintOperation *op,
 {
   cairo_t *cr;
 
-  cr = gtk_print_context_get_cairo (print_context);
+  cr = gtk_print_context_get_cairo_context (print_context);
   cairo_show_page (cr);
 }
 
@@ -1717,7 +1717,7 @@ print_pages_idle (gpointer user_data)
   _gtk_print_context_set_page_setup (data->print_context, page_setup);
   data->op->priv->start_page (data->op, data->print_context, page_setup);
   
-  cr = gtk_print_context_get_cairo (data->print_context);
+  cr = gtk_print_context_get_cairo_context (data->print_context);
   
   cairo_save (cr);
   if (priv->manual_scale != 100.0)