GtkIconTheme: fix regression from 0db32f0632ef4675bfcfc9ec201f7af157a48ab0

[~andy/gtk] / gtk / gtkfontchooser.h

diff --git a/gtk/gtkfontchooser.h b/gtk/gtkfontchooser.h
index a33220cbb2d696eda8a88e7f992bc7188532b616..1c1bbf09b17ba602eb7ce9b2efbec22226293b28 100644 (file)
--- a/gtk/gtkfontchooser.h
+++ b/gtk/gtkfontchooser.h
@@ -15,18 +15,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_FONT_CHOOSER_H__
+#define __GTK_FONT_CHOOSER_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_FONT_CHOOSER_H__
-#define __GTK_FONT_CHOOSER_H__
-
 #include <gtk/gtkwidget.h>
 
 G_BEGIN_DECLS
@@ -59,13 +57,13 @@ struct _GtkFontChooserIface
   GTypeInterface base_iface;
 
   /* Methods */
-  PangoFontFamily * (* get_font_family)         (GtkFontChooser  *chooser);
-  PangoFontFace *   (* get_font_face)           (GtkFontChooser  *chooser);
-  gint              (* get_font_size)           (GtkFontChooser  *chooser);
+  PangoFontFamily * (* get_font_family)         (GtkFontChooser  *fontchooser);
+  PangoFontFace *   (* get_font_face)           (GtkFontChooser  *fontchooser);
+  gint              (* get_font_size)           (GtkFontChooser  *fontchooser);
 
-  void              (* set_filter_func)         (GtkFontChooser   *chooser,
+  void              (* set_filter_func)         (GtkFontChooser   *fontchooser,
                                                  GtkFontFilterFunc filter,
-                                                 gpointer          data,
+                                                 gpointer          user_data,
                                                  GDestroyNotify    destroy);
 
   /* Signals */