[gnome-control-center] printers: Avoid redefinition of UserResponseCallback
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] printers: Avoid redefinition of UserResponseCallback
- Date: Mon, 10 Sep 2012 13:56:23 +0000 (UTC)
commit 0a0bc59afacc08fe0ec6378a7171eb3fdb549fe3
Author: Bastien Nocera <hadess hadess net>
Date: Mon Sep 10 14:55:04 2012 +0100
printers: Avoid redefinition of UserResponseCallback
It was declared to be the same value in all three headers, which
causes problems with old version of GCC.
https://bugzilla.gnome.org/show_bug.cgi?id=683696
panels/printers/pp-jobs-dialog.h | 3 +--
panels/printers/pp-options-dialog.h | 3 +--
panels/printers/pp-ppd-selection-dialog.h | 2 --
panels/printers/pp-utils.h | 2 ++
4 files changed, 4 insertions(+), 6 deletions(-)
---
diff --git a/panels/printers/pp-jobs-dialog.h b/panels/printers/pp-jobs-dialog.h
index 72ae66b..3b91616 100644
--- a/panels/printers/pp-jobs-dialog.h
+++ b/panels/printers/pp-jobs-dialog.h
@@ -23,13 +23,12 @@
#define __PP_JOBS_DIALOG_H__
#include <gtk/gtk.h>
+#include "pp-utils.h"
G_BEGIN_DECLS
typedef struct _PpJobsDialog PpJobsDialog;
-typedef void (*UserResponseCallback) (GtkDialog *dialog, gint response_id, gpointer user_data);
-
PpJobsDialog *pp_jobs_dialog_new (GtkWindow *parent,
UserResponseCallback user_callback,
gpointer user_data,
diff --git a/panels/printers/pp-options-dialog.h b/panels/printers/pp-options-dialog.h
index 9ac3992..a208274 100644
--- a/panels/printers/pp-options-dialog.h
+++ b/panels/printers/pp-options-dialog.h
@@ -23,13 +23,12 @@
#define __PP_OPTIONS_DIALOG_H__
#include <gtk/gtk.h>
+#include "pp-utils.h"
G_BEGIN_DECLS
typedef struct _PpOptionsDialog PpOptionsDialog;
-typedef void (*UserResponseCallback) (GtkDialog *dialog, gint response_id, gpointer user_data);
-
PpOptionsDialog *pp_options_dialog_new (GtkWindow *parent,
UserResponseCallback user_callback,
gpointer user_data,
diff --git a/panels/printers/pp-ppd-selection-dialog.h b/panels/printers/pp-ppd-selection-dialog.h
index 2ea05d0..acc7be7 100644
--- a/panels/printers/pp-ppd-selection-dialog.h
+++ b/panels/printers/pp-ppd-selection-dialog.h
@@ -29,8 +29,6 @@ G_BEGIN_DECLS
typedef struct _PpPPDSelectionDialog PpPPDSelectionDialog;
-typedef void (*UserResponseCallback) (GtkDialog *dialog, gint response_id, gpointer user_data);
-
PpPPDSelectionDialog *pp_ppd_selection_dialog_new (GtkWindow *parent,
PPDList *ppd_list,
gchar *manufacturer,
diff --git a/panels/printers/pp-utils.h b/panels/printers/pp-utils.h
index 6d18bfe..cb8e88e 100644
--- a/panels/printers/pp-utils.h
+++ b/panels/printers/pp-utils.h
@@ -34,6 +34,8 @@
G_BEGIN_DECLS
+typedef void (*UserResponseCallback) (GtkDialog *dialog, gint response_id, gpointer user_data);
+
/*
* Match level of PPD driver.
*/
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]