[dia] Fix action callback parameters

[Hans Breuer <hans src gnome org>]

commit d8c29b4ccc30137dc5a6ef11c3f7aeaba6b67c9a
Author: Hans Breuer <hans breuer org>
Date:   Sun Apr 29 15:35:56 2012 +0200

    Fix action callback parameters
    
    All these callback functions connected in menus.c had wrong prototypes
    since the introduction of the GtkAction framework in 2008.

 app/filedlg.c          |   10 +++++-----
 app/filedlg.h          |    8 ++++----
 app/find-and-replace.c |    4 ++--
 app/find-and-replace.h |    4 ++--
 app/interface.c        |   17 -----------------
 app/interface.h        |    1 -
 app/plugin-manager.c   |    2 +-
 app/plugin-manager.h   |    2 +-
 app/select.c           |   12 ++++++------
 app/select.h           |   12 ++++++------
 10 files changed, 27 insertions(+), 45 deletions(-)
---
diff --git a/app/filedlg.c b/app/filedlg.c
index 195b6e5..e71401f 100644
--- a/app/filedlg.c
+++ b/app/filedlg.c
@@ -268,7 +268,7 @@ file_open_response_callback(GtkWidget *fs,
  * This is either with or without diagram
  */
 void
-file_open_callback(gpointer data, guint action, GtkWidget *widget)
+file_open_callback(GtkAction *action)
 {
   if (!opendlg) {
     DDisplay *ddisp;
@@ -446,7 +446,7 @@ static GtkWidget *file_save_as_dialog_prepare (Diagram *dia, DDisplay *ddisp);
  * change. Maybe we should also indicate the refernced diagram in the dialog.
  */
 void
-file_save_as_callback(gpointer data, guint action, GtkWidget *widget)
+file_save_as_callback(GtkAction *action)
 {
   DDisplay  *ddisp;
   Diagram   *dia;
@@ -563,7 +563,7 @@ file_save_as_dialog_prepare (Diagram *dia, DDisplay *ddisp)
  * Delegates to Save As if there is no filename set yet.
  */
 void
-file_save_callback(gpointer data, guint action, GtkWidget *widget)
+file_save_callback(GtkAction *action)
 {
   Diagram *diagram;
 
@@ -571,7 +571,7 @@ file_save_callback(gpointer data, guint action, GtkWidget *widget)
   if (!diagram) return;
 
   if (diagram->unsaved) {
-    file_save_as_callback(data, action, widget);
+    file_save_as_callback(action);
   } else {
     gchar *filename = g_filename_from_utf8(diagram->filename, -1, NULL, NULL, NULL);
     diagram_update_extents(diagram);
@@ -750,7 +750,7 @@ file_export_response_callback(GtkWidget *fs,
  * React to <Display>/File/Export
  */
 void
-file_export_callback(gpointer data, guint action, GtkWidget *widget)
+file_export_callback(GtkAction *action)
 {
   DDisplay *ddisp;
   Diagram *dia;
diff --git a/app/filedlg.h b/app/filedlg.h
index e19827e..ae98180 100644
--- a/app/filedlg.h
+++ b/app/filedlg.h
@@ -24,10 +24,10 @@
 
 #include <gtk/gtk.h>
 
-void file_open_callback(gpointer data, guint action, GtkWidget *widget);
-void file_save_callback(gpointer data, guint action, GtkWidget *widget);
-void file_save_as_callback(gpointer data, guint action, GtkWidget *widget);
-void file_export_callback(gpointer data, guint action, GtkWidget *widget);
+void file_open_callback(GtkAction *action);
+void file_save_callback(GtkAction *action);
+void file_save_as_callback(GtkAction *action);
+void file_export_callback(GtkAction *action);
 
 gboolean file_save_as(Diagram *dia, DDisplay *ddisp);
 
diff --git a/app/find-and-replace.c b/app/find-and-replace.c
index 3d512bc..abc3fc1 100644
--- a/app/find-and-replace.c
+++ b/app/find-and-replace.c
@@ -496,7 +496,7 @@ fnr_dialog_setup_common (GtkWidget *dialog, gboolean is_replace, DDisplay *ddisp
  * React to <Display>/Edit/Find
  */
 void
-edit_find_callback(gpointer data, guint action, GtkWidget *widget)
+edit_find_callback(GtkAction *action)
 {
   DDisplay *ddisp;
   GtkWidget *dialog;
@@ -525,7 +525,7 @@ edit_find_callback(gpointer data, guint action, GtkWidget *widget)
  * React to <Display>/Edit/Replace
  */
 void
-edit_replace_callback(gpointer data, guint action, GtkWidget *widget)
+edit_replace_callback(GtkAction *action)
 {
   DDisplay *ddisp;
   GtkWidget *dialog;
diff --git a/app/find-and-replace.h b/app/find-and-replace.h
index 4a5be36..e65cd5d 100644
--- a/app/find-and-replace.h
+++ b/app/find-and-replace.h
@@ -23,8 +23,8 @@
 #ifndef FIND_AND_REPLACE_H
 #define FIND_AND_REPLACE_H
 
-void edit_find_callback (gpointer data, guint action, GtkWidget *widget);
-void edit_replace_callback (gpointer data, guint action, GtkWidget *widget);
+void edit_find_callback (GtkAction *action);
+void edit_replace_callback (GtkAction *action);
 
 #endif /* FIND_AND_REPLACE_H */
 
diff --git a/app/interface.c b/app/interface.c
index e6c46e8..cdcc8c6 100644
--- a/app/interface.c
+++ b/app/interface.c
@@ -1092,23 +1092,6 @@ tool_setup_drag_source(GtkWidget *button, ToolButtonData *tooldata,
 			     pixmap, mask);
 }
 
-/*
-void 
-tool_select_callback(GtkWidget *widget, gpointer data) {
-  ToolButtonData *tooldata = (ToolButtonData *)data;
-
-  if (tooldata == NULL) {
-    g_warning("NULL tooldata in tool_select_callback");
-    return;
-  }
-
-  if (tooldata->type != -1) {
-    tool_select (tooldata->type, tooldata->extra_data, 
-                 tooldata->user_data,widget);    
-  }
-}
-*/
-
 GdkPixbuf *
 tool_get_pixbuf (ToolButton *tb)
 {
diff --git a/app/interface.h b/app/interface.h
index 71a4962..6115d91 100644
--- a/app/interface.h
+++ b/app/interface.h
@@ -58,7 +58,6 @@ void toolbox_hide(void);
 
 GtkWidget *interface_get_toolbox_shell(void);
 
-void tool_select_callback(GtkWidget *widget, gpointer data);
 void create_integrated_ui (void);
 
 void create_sheets(GtkWidget *parent);
diff --git a/app/plugin-manager.c b/app/plugin-manager.c
index f77b14d..8b3df96 100644
--- a/app/plugin-manager.c
+++ b/app/plugin-manager.c
@@ -294,7 +294,7 @@ get_plugin_manager(void)
 }
 
 void
-file_plugins_callback(gpointer data, guint action, GtkWidget *widget)
+file_plugins_callback(GtkAction *action)
 {
   GtkWidget *pm = get_plugin_manager();
 
diff --git a/app/plugin-manager.h b/app/plugin-manager.h
index 761e545..8f10bef 100644
--- a/app/plugin-manager.h
+++ b/app/plugin-manager.h
@@ -24,6 +24,6 @@
 
 #include <gtk/gtk.h>
 
-void file_plugins_callback(gpointer data, guint action, GtkWidget *widget);
+void file_plugins_callback(GtkAction *action);
 
 #endif
diff --git a/app/select.c b/app/select.c
index 99e0054..738562e 100644
--- a/app/select.c
+++ b/app/select.c
@@ -31,7 +31,7 @@
 SelectionStyle selection_style = SELECT_REPLACE;
 
 void
-select_all_callback(gpointer data, guint action, GtkWidget *widget)
+select_all_callback(GtkAction *action)
 {
   Diagram *dia;
   GList *objects;
@@ -58,7 +58,7 @@ select_all_callback(gpointer data, guint action, GtkWidget *widget)
 }
 
 void
-select_none_callback(gpointer data, guint action, GtkWidget *widget)
+select_none_callback(GtkAction *action)
 {
   Diagram * dia;
   DDisplay * ddisp = ddisplay_active();
@@ -74,7 +74,7 @@ select_none_callback(gpointer data, guint action, GtkWidget *widget)
 }
 
 void
-select_invert_callback(gpointer data, guint action, GtkWidget *widget)
+select_invert_callback(GtkAction *action)
 {
   Diagram *dia;
   GList *tmp;
@@ -105,7 +105,7 @@ select_invert_callback(gpointer data, guint action, GtkWidget *widget)
  * objects, but only in the active layer.
  */
 void
-select_connected_callback(gpointer data, guint action, GtkWidget *widget)
+select_connected_callback(GtkAction *action)
 {
   Diagram *dia;
   DDisplay * ddisp = ddisplay_active();
@@ -199,7 +199,7 @@ select_transitively(Diagram *dia, DiaObject *obj)
  * object, but only in the active layer.
  */
 void
-select_transitive_callback(gpointer data, guint action, GtkWidget *widget)
+select_transitive_callback(GtkAction *action)
 {
   DDisplay *ddisp = ddisplay_active();
   Diagram *dia;
@@ -220,7 +220,7 @@ select_transitive_callback(gpointer data, guint action, GtkWidget *widget)
 }
 
 void
-select_same_type_callback(gpointer data, guint action, GtkWidget *widget)
+select_same_type_callback(GtkAction *action)
 {
   /* For now, do a brute force version:  Check vs. all earlier selected.
      Later, we should really sort the selecteds first to avoid n^2 */
diff --git a/app/select.h b/app/select.h
index bc60f2f..12e66a3 100644
--- a/app/select.h
+++ b/app/select.h
@@ -31,12 +31,12 @@ typedef enum {
 
 extern SelectionStyle selection_style;
 
-void select_all_callback(gpointer data, guint action, GtkWidget *widget);
-void select_none_callback(gpointer data, guint action, GtkWidget *widget);
-void select_invert_callback(gpointer data, guint action, GtkWidget *widget);
-void select_connected_callback(gpointer data, guint action, GtkWidget *widget);
-void select_transitive_callback(gpointer data, guint action, GtkWidget*widget);
-void select_same_type_callback(gpointer data, guint action, GtkWidget *widget);
+void select_all_callback(GtkAction *action);
+void select_none_callback(GtkAction *action);
+void select_invert_callback(GtkAction *action);
+void select_connected_callback(GtkAction *action);
+void select_transitive_callback(GtkAction *action);
+void select_same_type_callback(GtkAction *action);
 void select_style_callback(GtkAction *action, GtkRadioAction *current, gpointer user_data);
 
 #endif