gimp-dimage-color (1.1.0-3) src/dimage_color.c

--- gimp-dimage-color-1.1.0.orig/src/dimage_color.c
+++ gimp-dimage-color-1.1.0/src/dimage_color.c
@@ -25,7 +25,7 @@
 #include <gtk/gtk.h>
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
-#include <libgimp/gimpmatrix.h>
+#include <libgimpmath/gimpmatrix.h>
 
 #include "plugin-intl.h"
 #include "transform.h"
@@ -38,9 +38,9 @@
 DialogValues dc_int = { FALSE, TRUE, TRUE };
 
 static void query (void);
-static void run (gchar *name,
+static void run (const gchar *name,
 		 gint nparams,
-		 GimpParam *param,
+		 const GimpParam *param,
 		 gint *nreturn_vals,
 		 GimpParam **return_vals);
 
@@ -69,41 +69,38 @@
     { GIMP_PDB_INT32,    "tone_curve", "Tone curve" },
   };
 
-  static gint nargs = sizeof (args) / sizeof (args[0]);
-  
-  gimp_plugin_domain_register (PLUGIN_NAME, LOCALEDIR);
-  gimp_plugin_help_register (DATADIR "/help");
-
   gimp_install_procedure (PLUG_IN_NAME,
 			  "Minolta DiMAGE Color to sRGB",
 			  "Converts DiMAGE 5/7 pictures to sRGB colorspace",
 			  "Laurent Houdard",
 			  "Laurent Houdard",
 			  "2002-02-05",
-			  N_("<Image>/Image/Colors/Dimage Color to sRGB"),
+			  N_("<Image>/Filters/Colors/DiMAGE Color to sRGB"),
 			  "RGB*",
 			  GIMP_PLUGIN,
-			  nargs, 0, 
+			  G_N_ELEMENTS (args), 0, 
 			  args, NULL);
 }
 
 static void
-run (gchar *name,
+run (const gchar *name,
      gint n_params,
-     GimpParam *param,
+     const GimpParam *param,
      gint *nreturn_vals,
      GimpParam **return_vals)
 {
   static GimpParam values[1];
   GimpPDBStatusType status = GIMP_PDB_SUCCESS;
   GimpDrawable *drawable;
-  GimpRunModeType run_mode;
+  GimpRunMode run_mode;
   gint32 image_id;
   gint32 drawable_id;
 
   *nreturn_vals = 1;
   *return_vals = values;
 
+  INIT_I18N();
+
   values[0].type = GIMP_PDB_STATUS;
   values[0].data.d_status = status;
 
@@ -118,7 +115,6 @@
   switch (run_mode)
     {
     case GIMP_RUN_INTERACTIVE:
-      INIT_I18N_UI();
       gimp_get_data (PLUG_IN_NAME, &dc_vals);
       build_preview (drawable);
       if (! dimage_color_dialog ()) {
@@ -127,13 +123,11 @@
       break;
       
     case GIMP_RUN_NONINTERACTIVE:
-      INIT_I18N();
       dc_vals.gamma      = param[3].data.d_int32;
       dc_vals.tone_curve = param[4].data.d_int32;
       break;
 
     case GIMP_RUN_WITH_LAST_VALS:
-      INIT_I18N();
       gimp_get_data (PLUG_IN_NAME, &dc_vals);
       break;
 
@@ -156,13 +150,6 @@
 }
 
 static void
-dimage_color_ok_callback (GtkWidget *widget, gpointer data)
-{
-  dc_int.run = TRUE;
-  gtk_widget_destroy (GTK_WIDGET (data));
-}
-
-static void
 dimage_color_toggle_callback (GtkWidget *widget, gpointer data)
 {
   gimp_toggle_button_update (widget, data);
@@ -196,14 +183,11 @@
   gimp_ui_init ("dimage_color", TRUE);
 
   dlg = gimp_dialog_new(_("Dimage color"), "dimage_color",
+		  	NULL, 0,
 			gimp_standard_help_func, "filters/dimage_color.html",
-			GTK_WIN_POS_MOUSE,
-			FALSE, TRUE, FALSE,
 
-			_("OK"), dimage_color_ok_callback,
-			NULL, NULL, NULL, TRUE, FALSE,
-			_("Cancel"), gtk_widget_destroy,
-			NULL, 1, NULL, FALSE, TRUE,
+				  GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+				  GTK_STOCK_OK,     GTK_RESPONSE_OK,
 
 			NULL);
 
@@ -279,7 +263,7 @@
   gtk_misc_set_padding (GTK_MISC (tone_label), 20, 0);
 
   tone_menu = 
-    gimp_option_menu_new2 (FALSE, dimage_color_menu_item_update,
+    gimp_option_menu_new2 (FALSE, G_CALLBACK(dimage_color_menu_item_update),
 			   &dc_vals.tone_curve, (gpointer) dc_vals.tone_curve,
 
 			   _("Default"), (gpointer) CURVE_DEFAULT, NULL,
@@ -294,10 +278,7 @@
 
   gtk_widget_show (dlg);
 
-  gtk_main ();
-  gdk_flush ();
-
-  return dc_int.run;
+  return gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK;
 }
 
 static GimpPDBStatusType
@@ -312,7 +293,7 @@
   gpointer pr;
 
   /* Get selection area */
-  gimp_drawable_mask_bounds (drawable->id, &x1, &y1, &x2, &y2);
+  gimp_drawable_mask_bounds (drawable->drawable_id, &x1, &y1, &x2, &y2);
 
   progress = 0;
   max_progress = (x2 - x1) * (y2 - y1);
@@ -352,8 +333,8 @@
 
   /* Update the region */
   gimp_drawable_flush (drawable);
-  gimp_drawable_merge_shadow (drawable->id, TRUE);
-  gimp_drawable_update (drawable->id, x1, y1, (x2 - x1), (y2 - y1));
+  gimp_drawable_merge_shadow (drawable->drawable_id, TRUE);
+  gimp_drawable_update (drawable->drawable_id, x1, y1, (x2 - x1), (y2 - y1));
 
   return GIMP_PDB_SUCCESS;
 }