From 948e64ce0a80c4f70c19b66c0b950480c2ff570b Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Mon, 16 Jun 2003 11:40:11 +0000 Subject: [PATCH] minor cleanups. (struct dbbrowser_t): use GimpDBBrowserApplyCallback type 2003-06-16 Michael Natterer * plug-ins/dbbrowser/dbbrowser_utils.c: minor cleanups. (struct dbbrowser_t): use GimpDBBrowserApplyCallback type instead of duplicating its signature when specifying the "apply_callback" member. Minor cleanups --- ChangeLog | 7 +++++ libgimp/gimpprocbrowserdialog.c | 40 +++++++++++----------------- libgimp/gimpprocview.c | 40 +++++++++++----------------- plug-ins/dbbrowser/dbbrowser_utils.c | 40 +++++++++++----------------- plug-ins/dbbrowser/gimpprocbrowser.c | 40 +++++++++++----------------- plug-ins/dbbrowser/gimpprocview.c | 40 +++++++++++----------------- 6 files changed, 82 insertions(+), 125 deletions(-) diff --git a/ChangeLog b/ChangeLog index 18fed68ba8..b811d0abb8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2003-06-16 Michael Natterer + + * plug-ins/dbbrowser/dbbrowser_utils.c: minor cleanups. + (struct dbbrowser_t): use GimpDBBrowserApplyCallback type instead + of duplicating its signature when specifying the "apply_callback" + member. Minor cleanups + 2003-06-16 Michael Natterer * plug-ins/script-fu/script-fu-scripts.c (script_fu_find_scripts): diff --git a/libgimp/gimpprocbrowserdialog.c b/libgimp/gimpprocbrowserdialog.c index 850442917d..513a245b06 100644 --- a/libgimp/gimpprocbrowserdialog.c +++ b/libgimp/gimpprocbrowserdialog.c @@ -71,18 +71,7 @@ typedef struct GimpParamDef *selected_params; GimpParamDef *selected_return_vals; - void (* apply_callback) (gchar *proc_name, - gchar *scheme_proc_name, - gchar *proc_blurb, - gchar *proc_help, - gchar *proc_author, - gchar *proc_copyright, - gchar *proc_date, - GimpPDBProcType proc_type, - gint nparams, - gint nreturn_vals, - GimpParamDef *params, - GimpParamDef *return_vals); + GimpDBBrowserApplyCallback apply_callback; } dbbrowser_t; /* local functions */ @@ -326,16 +315,16 @@ dialog_select (dbbrowser_t *dbbrowser, g_free (dbbrowser->selected_return_vals); gimp_procedural_db_proc_info (proc_name, - &(dbbrowser->selected_proc_blurb), - &(dbbrowser->selected_proc_help), - &(dbbrowser->selected_proc_author), - &(dbbrowser->selected_proc_copyright), - &(dbbrowser->selected_proc_date), - &(dbbrowser->selected_proc_type), - &(dbbrowser->selected_nparams), - &(dbbrowser->selected_nreturn_vals), - &(dbbrowser->selected_params), - &(dbbrowser->selected_return_vals)); + &dbbrowser->selected_proc_blurb, + &dbbrowser->selected_proc_help, + &dbbrowser->selected_proc_author, + &dbbrowser->selected_proc_copyright, + &dbbrowser->selected_proc_date, + &dbbrowser->selected_proc_type, + &dbbrowser->selected_nparams, + &dbbrowser->selected_nreturn_vals, + &dbbrowser->selected_params, + &dbbrowser->selected_return_vals); /* save the "old" table */ old_description = dbbrowser->description; @@ -537,7 +526,7 @@ dialog_show_message (dbbrowser_t *dbbrowser, if (dbbrowser->description) gtk_container_remove (GTK_CONTAINER (dbbrowser->descr_vbox), dbbrowser->description); - + dbbrowser->description = gtk_label_new (message); gtk_box_pack_start (GTK_BOX (dbbrowser->descr_vbox), dbbrowser->description, FALSE, FALSE, 0); @@ -601,7 +590,7 @@ dialog_search_callback (GtkWidget *widget, /* search */ - if (widget == (dbbrowser->name_button)) + if (widget == dbbrowser->name_button) { dialog_show_message (dbbrowser, _("Searching by name - please wait")); @@ -624,7 +613,7 @@ dialog_search_callback (GtkWidget *widget, g_string_free (query, TRUE); } - else if (widget == (dbbrowser->blurb_button)) + else if (widget == dbbrowser->blurb_button) { dialog_show_message (dbbrowser, _("Searching by blurb - please wait")); @@ -637,6 +626,7 @@ dialog_search_callback (GtkWidget *widget, else { dialog_show_message (dbbrowser, _("Searching - please wait")); + gimp_procedural_db_query (".*", ".*", ".*", ".*", ".*", ".*", ".*", &num_procs, &proc_list); } diff --git a/libgimp/gimpprocview.c b/libgimp/gimpprocview.c index 850442917d..513a245b06 100644 --- a/libgimp/gimpprocview.c +++ b/libgimp/gimpprocview.c @@ -71,18 +71,7 @@ typedef struct GimpParamDef *selected_params; GimpParamDef *selected_return_vals; - void (* apply_callback) (gchar *proc_name, - gchar *scheme_proc_name, - gchar *proc_blurb, - gchar *proc_help, - gchar *proc_author, - gchar *proc_copyright, - gchar *proc_date, - GimpPDBProcType proc_type, - gint nparams, - gint nreturn_vals, - GimpParamDef *params, - GimpParamDef *return_vals); + GimpDBBrowserApplyCallback apply_callback; } dbbrowser_t; /* local functions */ @@ -326,16 +315,16 @@ dialog_select (dbbrowser_t *dbbrowser, g_free (dbbrowser->selected_return_vals); gimp_procedural_db_proc_info (proc_name, - &(dbbrowser->selected_proc_blurb), - &(dbbrowser->selected_proc_help), - &(dbbrowser->selected_proc_author), - &(dbbrowser->selected_proc_copyright), - &(dbbrowser->selected_proc_date), - &(dbbrowser->selected_proc_type), - &(dbbrowser->selected_nparams), - &(dbbrowser->selected_nreturn_vals), - &(dbbrowser->selected_params), - &(dbbrowser->selected_return_vals)); + &dbbrowser->selected_proc_blurb, + &dbbrowser->selected_proc_help, + &dbbrowser->selected_proc_author, + &dbbrowser->selected_proc_copyright, + &dbbrowser->selected_proc_date, + &dbbrowser->selected_proc_type, + &dbbrowser->selected_nparams, + &dbbrowser->selected_nreturn_vals, + &dbbrowser->selected_params, + &dbbrowser->selected_return_vals); /* save the "old" table */ old_description = dbbrowser->description; @@ -537,7 +526,7 @@ dialog_show_message (dbbrowser_t *dbbrowser, if (dbbrowser->description) gtk_container_remove (GTK_CONTAINER (dbbrowser->descr_vbox), dbbrowser->description); - + dbbrowser->description = gtk_label_new (message); gtk_box_pack_start (GTK_BOX (dbbrowser->descr_vbox), dbbrowser->description, FALSE, FALSE, 0); @@ -601,7 +590,7 @@ dialog_search_callback (GtkWidget *widget, /* search */ - if (widget == (dbbrowser->name_button)) + if (widget == dbbrowser->name_button) { dialog_show_message (dbbrowser, _("Searching by name - please wait")); @@ -624,7 +613,7 @@ dialog_search_callback (GtkWidget *widget, g_string_free (query, TRUE); } - else if (widget == (dbbrowser->blurb_button)) + else if (widget == dbbrowser->blurb_button) { dialog_show_message (dbbrowser, _("Searching by blurb - please wait")); @@ -637,6 +626,7 @@ dialog_search_callback (GtkWidget *widget, else { dialog_show_message (dbbrowser, _("Searching - please wait")); + gimp_procedural_db_query (".*", ".*", ".*", ".*", ".*", ".*", ".*", &num_procs, &proc_list); } diff --git a/plug-ins/dbbrowser/dbbrowser_utils.c b/plug-ins/dbbrowser/dbbrowser_utils.c index 850442917d..513a245b06 100644 --- a/plug-ins/dbbrowser/dbbrowser_utils.c +++ b/plug-ins/dbbrowser/dbbrowser_utils.c @@ -71,18 +71,7 @@ typedef struct GimpParamDef *selected_params; GimpParamDef *selected_return_vals; - void (* apply_callback) (gchar *proc_name, - gchar *scheme_proc_name, - gchar *proc_blurb, - gchar *proc_help, - gchar *proc_author, - gchar *proc_copyright, - gchar *proc_date, - GimpPDBProcType proc_type, - gint nparams, - gint nreturn_vals, - GimpParamDef *params, - GimpParamDef *return_vals); + GimpDBBrowserApplyCallback apply_callback; } dbbrowser_t; /* local functions */ @@ -326,16 +315,16 @@ dialog_select (dbbrowser_t *dbbrowser, g_free (dbbrowser->selected_return_vals); gimp_procedural_db_proc_info (proc_name, - &(dbbrowser->selected_proc_blurb), - &(dbbrowser->selected_proc_help), - &(dbbrowser->selected_proc_author), - &(dbbrowser->selected_proc_copyright), - &(dbbrowser->selected_proc_date), - &(dbbrowser->selected_proc_type), - &(dbbrowser->selected_nparams), - &(dbbrowser->selected_nreturn_vals), - &(dbbrowser->selected_params), - &(dbbrowser->selected_return_vals)); + &dbbrowser->selected_proc_blurb, + &dbbrowser->selected_proc_help, + &dbbrowser->selected_proc_author, + &dbbrowser->selected_proc_copyright, + &dbbrowser->selected_proc_date, + &dbbrowser->selected_proc_type, + &dbbrowser->selected_nparams, + &dbbrowser->selected_nreturn_vals, + &dbbrowser->selected_params, + &dbbrowser->selected_return_vals); /* save the "old" table */ old_description = dbbrowser->description; @@ -537,7 +526,7 @@ dialog_show_message (dbbrowser_t *dbbrowser, if (dbbrowser->description) gtk_container_remove (GTK_CONTAINER (dbbrowser->descr_vbox), dbbrowser->description); - + dbbrowser->description = gtk_label_new (message); gtk_box_pack_start (GTK_BOX (dbbrowser->descr_vbox), dbbrowser->description, FALSE, FALSE, 0); @@ -601,7 +590,7 @@ dialog_search_callback (GtkWidget *widget, /* search */ - if (widget == (dbbrowser->name_button)) + if (widget == dbbrowser->name_button) { dialog_show_message (dbbrowser, _("Searching by name - please wait")); @@ -624,7 +613,7 @@ dialog_search_callback (GtkWidget *widget, g_string_free (query, TRUE); } - else if (widget == (dbbrowser->blurb_button)) + else if (widget == dbbrowser->blurb_button) { dialog_show_message (dbbrowser, _("Searching by blurb - please wait")); @@ -637,6 +626,7 @@ dialog_search_callback (GtkWidget *widget, else { dialog_show_message (dbbrowser, _("Searching - please wait")); + gimp_procedural_db_query (".*", ".*", ".*", ".*", ".*", ".*", ".*", &num_procs, &proc_list); } diff --git a/plug-ins/dbbrowser/gimpprocbrowser.c b/plug-ins/dbbrowser/gimpprocbrowser.c index 850442917d..513a245b06 100644 --- a/plug-ins/dbbrowser/gimpprocbrowser.c +++ b/plug-ins/dbbrowser/gimpprocbrowser.c @@ -71,18 +71,7 @@ typedef struct GimpParamDef *selected_params; GimpParamDef *selected_return_vals; - void (* apply_callback) (gchar *proc_name, - gchar *scheme_proc_name, - gchar *proc_blurb, - gchar *proc_help, - gchar *proc_author, - gchar *proc_copyright, - gchar *proc_date, - GimpPDBProcType proc_type, - gint nparams, - gint nreturn_vals, - GimpParamDef *params, - GimpParamDef *return_vals); + GimpDBBrowserApplyCallback apply_callback; } dbbrowser_t; /* local functions */ @@ -326,16 +315,16 @@ dialog_select (dbbrowser_t *dbbrowser, g_free (dbbrowser->selected_return_vals); gimp_procedural_db_proc_info (proc_name, - &(dbbrowser->selected_proc_blurb), - &(dbbrowser->selected_proc_help), - &(dbbrowser->selected_proc_author), - &(dbbrowser->selected_proc_copyright), - &(dbbrowser->selected_proc_date), - &(dbbrowser->selected_proc_type), - &(dbbrowser->selected_nparams), - &(dbbrowser->selected_nreturn_vals), - &(dbbrowser->selected_params), - &(dbbrowser->selected_return_vals)); + &dbbrowser->selected_proc_blurb, + &dbbrowser->selected_proc_help, + &dbbrowser->selected_proc_author, + &dbbrowser->selected_proc_copyright, + &dbbrowser->selected_proc_date, + &dbbrowser->selected_proc_type, + &dbbrowser->selected_nparams, + &dbbrowser->selected_nreturn_vals, + &dbbrowser->selected_params, + &dbbrowser->selected_return_vals); /* save the "old" table */ old_description = dbbrowser->description; @@ -537,7 +526,7 @@ dialog_show_message (dbbrowser_t *dbbrowser, if (dbbrowser->description) gtk_container_remove (GTK_CONTAINER (dbbrowser->descr_vbox), dbbrowser->description); - + dbbrowser->description = gtk_label_new (message); gtk_box_pack_start (GTK_BOX (dbbrowser->descr_vbox), dbbrowser->description, FALSE, FALSE, 0); @@ -601,7 +590,7 @@ dialog_search_callback (GtkWidget *widget, /* search */ - if (widget == (dbbrowser->name_button)) + if (widget == dbbrowser->name_button) { dialog_show_message (dbbrowser, _("Searching by name - please wait")); @@ -624,7 +613,7 @@ dialog_search_callback (GtkWidget *widget, g_string_free (query, TRUE); } - else if (widget == (dbbrowser->blurb_button)) + else if (widget == dbbrowser->blurb_button) { dialog_show_message (dbbrowser, _("Searching by blurb - please wait")); @@ -637,6 +626,7 @@ dialog_search_callback (GtkWidget *widget, else { dialog_show_message (dbbrowser, _("Searching - please wait")); + gimp_procedural_db_query (".*", ".*", ".*", ".*", ".*", ".*", ".*", &num_procs, &proc_list); } diff --git a/plug-ins/dbbrowser/gimpprocview.c b/plug-ins/dbbrowser/gimpprocview.c index 850442917d..513a245b06 100644 --- a/plug-ins/dbbrowser/gimpprocview.c +++ b/plug-ins/dbbrowser/gimpprocview.c @@ -71,18 +71,7 @@ typedef struct GimpParamDef *selected_params; GimpParamDef *selected_return_vals; - void (* apply_callback) (gchar *proc_name, - gchar *scheme_proc_name, - gchar *proc_blurb, - gchar *proc_help, - gchar *proc_author, - gchar *proc_copyright, - gchar *proc_date, - GimpPDBProcType proc_type, - gint nparams, - gint nreturn_vals, - GimpParamDef *params, - GimpParamDef *return_vals); + GimpDBBrowserApplyCallback apply_callback; } dbbrowser_t; /* local functions */ @@ -326,16 +315,16 @@ dialog_select (dbbrowser_t *dbbrowser, g_free (dbbrowser->selected_return_vals); gimp_procedural_db_proc_info (proc_name, - &(dbbrowser->selected_proc_blurb), - &(dbbrowser->selected_proc_help), - &(dbbrowser->selected_proc_author), - &(dbbrowser->selected_proc_copyright), - &(dbbrowser->selected_proc_date), - &(dbbrowser->selected_proc_type), - &(dbbrowser->selected_nparams), - &(dbbrowser->selected_nreturn_vals), - &(dbbrowser->selected_params), - &(dbbrowser->selected_return_vals)); + &dbbrowser->selected_proc_blurb, + &dbbrowser->selected_proc_help, + &dbbrowser->selected_proc_author, + &dbbrowser->selected_proc_copyright, + &dbbrowser->selected_proc_date, + &dbbrowser->selected_proc_type, + &dbbrowser->selected_nparams, + &dbbrowser->selected_nreturn_vals, + &dbbrowser->selected_params, + &dbbrowser->selected_return_vals); /* save the "old" table */ old_description = dbbrowser->description; @@ -537,7 +526,7 @@ dialog_show_message (dbbrowser_t *dbbrowser, if (dbbrowser->description) gtk_container_remove (GTK_CONTAINER (dbbrowser->descr_vbox), dbbrowser->description); - + dbbrowser->description = gtk_label_new (message); gtk_box_pack_start (GTK_BOX (dbbrowser->descr_vbox), dbbrowser->description, FALSE, FALSE, 0); @@ -601,7 +590,7 @@ dialog_search_callback (GtkWidget *widget, /* search */ - if (widget == (dbbrowser->name_button)) + if (widget == dbbrowser->name_button) { dialog_show_message (dbbrowser, _("Searching by name - please wait")); @@ -624,7 +613,7 @@ dialog_search_callback (GtkWidget *widget, g_string_free (query, TRUE); } - else if (widget == (dbbrowser->blurb_button)) + else if (widget == dbbrowser->blurb_button) { dialog_show_message (dbbrowser, _("Searching by blurb - please wait")); @@ -637,6 +626,7 @@ dialog_search_callback (GtkWidget *widget, else { dialog_show_message (dbbrowser, _("Searching - please wait")); + gimp_procedural_db_query (".*", ".*", ".*", ".*", ".*", ".*", ".*", &num_procs, &proc_list); }