r17745 - gnucash/trunk/src/gnome-utils - Put gnc_print_session_fontsel_cb() inside #ifndef GTKHTML_USES_GTKPRINT.

Andreas Köhler andi5 at cvs.gnucash.org
Mon Dec 1 17:10:40 EST 2008


Author: andi5
Date: 2008-12-01 17:10:40 -0500 (Mon, 01 Dec 2008)
New Revision: 17745
Trac: http://svn.gnucash.org/trac/changeset/17745

Modified:
   gnucash/trunk/src/gnome-utils/print-session.c
Log:
Put gnc_print_session_fontsel_cb() inside #ifndef GTKHTML_USES_GTKPRINT.

This resolves a compilation error about GtkButton*.

Modified: gnucash/trunk/src/gnome-utils/print-session.c
===================================================================
--- gnucash/trunk/src/gnome-utils/print-session.c	2008-11-30 21:50:54 UTC (rev 17744)
+++ gnucash/trunk/src/gnome-utils/print-session.c	2008-12-01 22:10:40 UTC (rev 17745)
@@ -54,36 +54,7 @@
 G_LOCK_DEFINE_STATIC(page_setup);
 #endif
 
-static void gnc_print_session_fontsel_cb(GtkButton *widget, gpointer user_data)
-{
-  PrintSession *ps = (PrintSession *)user_data;
-  GtkWidget *dialog;
-  gint response;
 
-  dialog = gtk_font_selection_dialog_new("GnuCash Print Font");
-  if (ps->pango_font_string == NULL) {
-    GtkStyle *style = gtk_style_new();
-    ps->pango_font_string = pango_font_description_to_string(style->font_desc);
-    g_object_unref(style);
-  }
-  if (ps->pango_font_string != NULL)
-      gtk_font_selection_dialog_set_font_name((GtkFontSelectionDialog *)dialog, ps->pango_font_string);
-
-  response = gtk_dialog_run(GTK_DIALOG(dialog));
-  gtk_widget_destroy(dialog);
-
-  switch (response) {
-    case GTK_RESPONSE_OK:
-      g_free(ps->pango_font_string);
-      ps->pango_font_string = gtk_font_selection_dialog_get_font_name((GtkFontSelectionDialog *)dialog);
-      gnc_gconf_set_string(NULL, "pango_font_string", ps->pango_font_string, NULL);
-      break;
-
-    default:
-      break;
-  }
-}
-
 #ifdef HAVE_GTK_2_10
 void
 gnc_print_operation_save_print_settings(GtkPrintOperation *op)
@@ -156,6 +127,36 @@
 
 
 #ifndef GTKHTML_USES_GTKPRINT
+static void gnc_print_session_fontsel_cb(GtkButton *widget, gpointer user_data)
+{
+  PrintSession *ps = (PrintSession *)user_data;
+  GtkWidget *dialog;
+  gint response;
+
+  dialog = gtk_font_selection_dialog_new("GnuCash Print Font");
+  if (ps->pango_font_string == NULL) {
+    GtkStyle *style = gtk_style_new();
+    ps->pango_font_string = pango_font_description_to_string(style->font_desc);
+    g_object_unref(style);
+  }
+  if (ps->pango_font_string != NULL)
+      gtk_font_selection_dialog_set_font_name((GtkFontSelectionDialog *)dialog, ps->pango_font_string);
+
+  response = gtk_dialog_run(GTK_DIALOG(dialog));
+  gtk_widget_destroy(dialog);
+
+  switch (response) {
+    case GTK_RESPONSE_OK:
+      g_free(ps->pango_font_string);
+      ps->pango_font_string = gtk_font_selection_dialog_get_font_name((GtkFontSelectionDialog *)dialog);
+      gnc_gconf_set_string(NULL, "pango_font_string", ps->pango_font_string, NULL);
+      break;
+
+    default:
+      break;
+  }
+}
+
 PrintSession * 
 gnc_print_session_create(gboolean hand_built_pages)
 {



More information about the gnucash-changes mailing list