Replace FONT_TYPE macro with PangoFontDescription.

svn path=/trunk/; revision=24889

7 files changed, 13 insertions, 15 deletions

diff --git a/gtk/compat_macros.h b/gtk/compat_macros.h
index 87301424fb..695b15c5d6 100644
--- a/gtk/compat_macros.h
+++ b/gtk/compat_macros.h
@@ -191,6 +191,4 @@ gtk_toggle_button_new_with_mnemonic(label_text)
 #define PRIMARY_TEXT_START "<span weight=\"bold\" size=\"larger\">"
 #define PRIMARY_TEXT_END "</span>"
 
-#define FONT_TYPE PangoFontDescription
-
 #endif /* __COMPAT_MACROS_H__ */
diff --git a/gtk/font_utils.c b/gtk/font_utils.c
index 274875510a..b3b4db7cf4 100644
--- a/gtk/font_utils.c
+++ b/gtk/font_utils.c
@@ -55,14 +55,14 @@
 
 
 
-FONT_TYPE *m_r_font, *m_b_font;
+PangoFontDescription *m_r_font, *m_b_font;
 
 
 /* Get the regular user font.
  *
  * @return the regular user font
  */
-FONT_TYPE *user_font_get_regular(void)
+PangoFontDescription *user_font_get_regular(void)
 {
     return m_r_font;
 }
@@ -71,13 +71,13 @@ FONT_TYPE *user_font_get_regular(void)
  *
  * @return the bold user font
  */
-FONT_TYPE *user_font_get_bold(void)
+PangoFontDescription *user_font_get_bold(void)
 {
     return m_b_font;
 }
 
 static void
-set_fonts(FONT_TYPE *regular, FONT_TYPE *bold)
+set_fonts(PangoFontDescription *regular, PangoFontDescription *bold)
 {
 	/* Yes, assert. The code that loads the font should check
 	 * for NULL and provide its own error message. */
@@ -170,7 +170,7 @@ view_zoom_100_cb(GtkWidget *w _U_, gpointer d _U_)
 gboolean
 user_font_test(gchar *font_name)
 {
-	FONT_TYPE *new_r_font, *new_b_font;
+	PangoFontDescription *new_r_font, *new_b_font;
 
 	new_r_font = pango_font_description_from_string(font_name);
 	if (new_r_font == NULL) {
@@ -241,8 +241,8 @@ font_zoom(char *gui_font_name)
 fa_ret_t
 user_font_apply(void) {
     char *gui_font_name;
-    FONT_TYPE *new_r_font, *new_b_font;
-    FONT_TYPE *old_r_font = NULL, *old_b_font = NULL;
+    PangoFontDescription *new_r_font, *new_b_font;
+    PangoFontDescription *old_r_font = NULL, *old_b_font = NULL;
 
     /* convert font name to reflect the zoom level */
     gui_font_name = font_zoom(prefs.gui_font_name);
diff --git a/gtk/font_utils.h b/gtk/font_utils.h
index 4eafb3412b..d49e93182c 100644
--- a/gtk/font_utils.h
+++ b/gtk/font_utils.h
@@ -65,12 +65,12 @@ extern gboolean user_font_test(gchar *font_name);
  *
  * @return the regular user font
  */
-extern FONT_TYPE *user_font_get_regular(void);
+extern PangoFontDescription *user_font_get_regular(void);
 
 /** Get the bold user font.
  *
  * @return the bold user font
  */
-extern FONT_TYPE *user_font_get_bold(void);
+extern PangoFontDescription *user_font_get_bold(void);
 
 #endif
diff --git a/gtk/packet_list.c b/gtk/packet_list.c
index 5baebb2478..8ddcb54eb2 100644
--- a/gtk/packet_list.c
+++ b/gtk/packet_list.c
@@ -433,7 +433,7 @@ packet_list_set_sel_browse(gboolean val, gboolean force_set)
 
 /* Set the font of the packet list window. */
 void
-packet_list_set_font(FONT_TYPE *font)
+packet_list_set_font(PangoFontDescription *font)
 {
 	int i;
 	gint col_width;
diff --git a/gtk/packet_list.h b/gtk/packet_list.h
index 87d3d06069..d6cb2d1efa 100644
--- a/gtk/packet_list.h
+++ b/gtk/packet_list.h
@@ -93,7 +93,7 @@ extern gboolean packet_list_get_event_row_column(GtkWidget *widget,
  *
  * @param font the new font
  */
-extern void packet_list_set_font(FONT_TYPE *font);
+extern void packet_list_set_font(PangoFontDescription *font);
 
 /** Set the selection mode of the packet list window.
  *
diff --git a/gtk/proto_draw.c b/gtk/proto_draw.c
index 33a4c2b8ff..4c7713edd4 100644
--- a/gtk/proto_draw.c
+++ b/gtk/proto_draw.c
@@ -1409,7 +1409,7 @@ set_ptree_font_cb(gpointer data, gpointer user_data)
 }
 
 void
-set_ptree_font_all(FONT_TYPE *font)
+set_ptree_font_all(PangoFontDescription *font)
 {
     g_list_foreach(ptree_widgets, set_ptree_font_cb, font);
 }
diff --git a/gtk/tcp_graph.c b/gtk/tcp_graph.c
index 0244d7ccb6..030932df63 100644
--- a/gtk/tcp_graph.c
+++ b/gtk/tcp_graph.c
@@ -283,7 +283,7 @@ struct graph {
 	GtkWidget *drawing_area;
         GtkWidget *text;	/* text widget for seg list - probably
                                  * temporary */
-	FONT_TYPE *font;	/* font used for annotations etc. */
+	PangoFontDescription *font;	/* font used for annotations etc. */
 	GdkGC *fg_gc;
 	GdkGC *bg_gc;
 	GdkPixmap *title_pixmap;