6 files changed, 18 insertions, 6 deletions
diff --git a/image-converter/caja-image-converter.c b/image-converter/caja-image-converter.c
index b7f80b8..591d8e8 100644
--- a/image-converter/caja-image-converter.c
+++ b/image-converter/caja-image-converter.c
@@ -182,6 +182,7 @@ caja_image_converter_register_type (GTypeModule *module)
 sizeof (CajaImageConverter),
 0,
 (GInstanceInitFunc) caja_image_converter_instance_init,
+ NULL
 };
 
 static const GInterfaceInfo menu_provider_iface_info = {
diff --git a/image-converter/caja-image-converter.h b/image-converter/caja-image-converter.h
index c8beba7..ef57589 100644
--- a/image-converter/caja-image-converter.h
+++ b/image-converter/caja-image-converter.h
@@ -32,7 +32,6 @@ G_BEGIN_DECLS
 * instantiated by caja. It implements the GInterfaces
 * exported by libcaja. */
 
-
 #define CAJA_TYPE_IMAGE_CONVERTER (caja_image_converter_get_type ())
 #define CAJA_IMAGE_CONVERTER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), CAJA_TYPE_IMAGE_CONVERTER, CajaImageConverter))
 #define CAJA_IS_IMAGE_CONVERTER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), CAJA_TYPE_IMAGE_CONVERTER))
diff --git a/image-converter/caja-image-resize.ui b/image-converter/caja-image-resize.ui
index 5fe0ea3..f3bcbce 100644
--- a/image-converter/caja-image-resize.ui
+++ b/image-converter/caja-image-resize.ui
@@ -183,7 +183,7 @@
 <property name="can_focus">False</property>
 <property name="spacing">8</property>
 <child>
- <object class="GtkRadioButton">
+ <object class="GtkRadioButton" id="custom_pct_radiobutton">
 <property name="label" translatable="yes">Scale:</property>
 <property name="visible">True</property>
 <property name="can_focus">True</property>
diff --git a/image-converter/caja-image-resizer.c b/image-converter/caja-image-resizer.c
index 02484c1..f9ce576 100644
--- a/image-converter/caja-image-resizer.c
+++ b/image-converter/caja-image-resizer.c
@@ -258,7 +258,7 @@ run_op (CajaImageResizer *resizer)
 /* FIXME: check whether new_uri already exists and provide "Replace _All", "_Skip", and "_Replace" options */
 
 gchar *argv[6];
- argv[0] = "/usr/bin/convert";
+ argv[0] = "convert";
 argv[1] = filename;
 argv[2] = "-resize";
 argv[3] = resizer->size;
@@ -267,8 +267,11 @@ run_op (CajaImageResizer *resizer)
 
 pid_t pid;
 
- if (!g_spawn_async (NULL, argv, NULL, G_SPAWN_DO_NOT_REAP_CHILD, NULL, NULL, &pid, NULL)) {
+ if (filename == NULL || new_filename == NULL ||
+ !g_spawn_async (NULL, argv, NULL, G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD, NULL, NULL, &pid, NULL)) {
 // FIXME: error handling
+ g_free (filename);
+ g_free (new_filename);
 return;
 }
 
diff --git a/image-converter/caja-image-rotator.c b/image-converter/caja-image-rotator.c
index a46901b..256fb76 100644
--- a/image-converter/caja-image-rotator.c
+++ b/image-converter/caja-image-rotator.c
@@ -254,7 +254,7 @@ run_op (CajaImageRotator *rotator)
 /* FIXME: check whether new_uri already exists and provide "Replace _All", "_Skip", and "_Replace" options */
 
 gchar *argv[8];
- argv[0] = "/usr/bin/convert";
+ argv[0] = "convert";
 argv[1] = filename;
 argv[2] = "-rotate";
 argv[3] = rotator->angle;
@@ -265,8 +265,11 @@ run_op (CajaImageRotator *rotator)
 
 pid_t pid;
 
- if (!g_spawn_async (NULL, argv, NULL, G_SPAWN_DO_NOT_REAP_CHILD, NULL, NULL, &pid, NULL)) {
+ if (filename == NULL || new_filename == NULL ||
+ !g_spawn_async (NULL, argv, NULL, G_SPAWN_DO_NOT_REAP_CHILD | G_SPAWN_SEARCH_PATH, NULL, NULL, &pid, NULL)) {
 // FIXME: error handling
+ g_free (filename);
+ g_free (new_filename);
 return;
 }
 
diff --git a/image-converter/image-converter.c b/image-converter/image-converter.c
index dba1d24..a3fd248 100644
--- a/image-converter/image-converter.c
+++ b/image-converter/image-converter.c
@@ -27,6 +27,8 @@
 
 #include <glib/gi18n-lib.h>
 
+#include <libcaja-extension/caja-extension-types.h>
+
 #include "caja-image-converter.h"
 
 static GType type_list[1];
@@ -38,6 +40,10 @@ caja_module_initialize (GTypeModule *module)
 
 caja_image_converter_register_type (module);
 type_list[0] = CAJA_TYPE_IMAGE_CONVERTER;
+#ifdef ENABLE_NLS
+ bindtextdomain (GETTEXT_PACKAGE, MATELOCALEDIR);
+ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+#endif /* ENABLE_NLS */
 }
 
 void