File entangle-libgphoto25.patch of Package entangle

Overview Repositories Revisions Requests Users Attributes Meta

File entangle-libgphoto25.patch of Package entangle

Index: entangle-0.4.1/src/backend/entangle-camera-list.c
===================================================================
--- entangle-0.4.1.orig/src/backend/entangle-camera-list.c
+++ entangle-0.4.1/src/backend/entangle-camera-list.c
@@ -131,11 +131,9 @@ static void entangle_camera_list_udev_ev
 
 static void entangle_camera_list_gphoto_log(GPLogLevel level G_GNUC_UNUSED,
                                             const char *domain,
-                                            const char *format,
-                                            va_list args,
+                                            const char *msg,
                                             void *data G_GNUC_UNUSED)
 {
-    char *msg = g_strdup_vprintf(format, args);
     g_debug("%s: %s", domain, msg);
 }
 
Index: entangle-0.4.1/src/backend/entangle-camera.c
===================================================================
--- entangle-0.4.1.orig/src/backend/entangle-camera.c
+++ entangle-0.4.1/src/backend/entangle-camera.c
@@ -543,15 +543,14 @@ const char *entangle_camera_get_port(Ent
 
 static unsigned int do_entangle_camera_progress_start(GPContext *ctx G_GNUC_UNUSED,
                                                       float target,
-                                                      const char *format,
-                                                      va_list args,
+                                                      const char *msg,
                                                       void *data)
 {
     EntangleCamera *cam = data;
     EntangleCameraPrivate *priv = cam->priv;
 
     if (priv->progress)
-        entangle_progress_start(priv->progress, target, format, args);
+        entangle_progress_start(priv->progress, target, msg);
 
     return 0; /* XXX what is this actually useful for ? */
 }
@@ -588,15 +587,14 @@ static void entangle_camera_reset_last_e
 }
 
 static void do_entangle_camera_error(GPContext *ctx G_GNUC_UNUSED,
-                                     const char *fmt,
-                                     va_list args,
+                                     const char *msg,
                                      void *data)
 {
     EntangleCamera *cam = data;
     EntangleCameraPrivate *priv = cam->priv;
 
     entangle_camera_reset_last_error(cam);
-    priv->lastError = g_strdup_vprintf(fmt, args);
+    priv->lastError = g_strdup(msg);
     ENTANGLE_DEBUG("Got error %s", priv->lastError);
 }
 
Index: entangle-0.4.1/src/backend/entangle-progress.h
===================================================================
--- entangle-0.4.1.orig/src/backend/entangle-progress.h
+++ entangle-0.4.1/src/backend/entangle-progress.h
@@ -38,14 +38,14 @@ typedef struct _EntangleProgressInterfac
 struct _EntangleProgressInterface {
     GTypeInterface parent;
 
-    void (*start) (EntangleProgress *prog, float target, const char *format, va_list args);
+    void (*start) (EntangleProgress *prog, float target, const char *msg);
     void (*update) (EntangleProgress *prog, float current);
     void (*stop) (EntangleProgress *prog);
 };
 
 GType entangle_progress_get_type(void);
 
-void entangle_progress_start(EntangleProgress *prog, float target, const char *format, va_list args);
+void entangle_progress_start(EntangleProgress *prog, float target, const char *txt);
 void entangle_progress_update(EntangleProgress *prog, float current);
 void entangle_progress_stop(EntangleProgress *prog);
 
Index: entangle-0.4.1/src/backend/entangle-progress.c
===================================================================
--- entangle-0.4.1.orig/src/backend/entangle-progress.c
+++ entangle-0.4.1/src/backend/entangle-progress.c
@@ -23,11 +23,11 @@
 #include "entangle-debug.h"
 #include "entangle-progress.h"
 
-void entangle_progress_start(EntangleProgress *prog, float target, const char *format, va_list args)
+void entangle_progress_start(EntangleProgress *prog, float target, const char *msg)
 {
     g_return_if_fail(ENTANGLE_IS_PROGRESS(prog));
 
-    ENTANGLE_PROGRESS_GET_INTERFACE(prog)->start(prog, target, format, args);
+    ENTANGLE_PROGRESS_GET_INTERFACE(prog)->start(prog, target, msg);
 }
 
 void entangle_progress_update(EntangleProgress *prog, float current)
Index: entangle-0.4.1/src/frontend/entangle-camera-manager.c
===================================================================
--- entangle-0.4.1.orig/src/frontend/entangle-camera-manager.c
+++ entangle-0.4.1/src/frontend/entangle-camera-manager.c
@@ -1000,7 +1000,7 @@ static void do_camera_file_preview(Entan
 }
 
 
-static void do_entangle_camera_progress_start(EntangleProgress *iface, float target, const char *format, va_list args)
+static void do_entangle_camera_progress_start(EntangleProgress *iface, float target, const char *msg)
 {
     g_return_if_fail(ENTANGLE_IS_CAMERA_MANAGER(iface));
 
@@ -1016,7 +1016,7 @@ static void do_entangle_camera_progress_
     mtr = GTK_WIDGET(gtk_builder_get_object(priv->builder, "toolbar-progress"));
     operation = GTK_WIDGET(gtk_builder_get_object(priv->builder, "toolbar-operation"));
 
-    txt = g_strdup_vprintf(format, args);
+    txt = g_strdup(msg);
 
     gtk_widget_set_tooltip_text(mtr, txt);
     gtk_progress_bar_set_text(GTK_PROGRESS_BAR(mtr), txt);

Places

File entangle-libgphoto25.patch of Package entangle

Places