[gnome-software] Fix live installing firmware



commit 95f2b8b76fae6ca491f97cda25c12506f836256a
Author: Richard Hughes <richard hughsie com>
Date:   Thu Mar 17 13:43:42 2016 +0000

    Fix live installing firmware
    
    Use an explicit private symbol so the linker doesn't get confused.

 src/plugins/gs-plugin-fwupd.c |   30 +++++++++++++++++++++---------
 1 files changed, 21 insertions(+), 9 deletions(-)
---
diff --git a/src/plugins/gs-plugin-fwupd.c b/src/plugins/gs-plugin-fwupd.c
index fcae1e3..accd74f 100644
--- a/src/plugins/gs-plugin-fwupd.c
+++ b/src/plugins/gs-plugin-fwupd.c
@@ -690,15 +690,13 @@ gs_plugin_offline_update (GsPlugin *plugin,
 }
 
 /**
- * gs_plugin_app_install:
- *
- * Called when a user double clicks on a .cab file
+ * gs_plugin_fwupd_install:
  */
-gboolean
-gs_plugin_app_install (GsPlugin *plugin,
-                      GsApp *app,
-                      GCancellable *cancellable,
-                      GError **error)
+static gboolean
+gs_plugin_fwupd_install (GsPlugin *plugin,
+                        GsApp *app,
+                        GCancellable *cancellable,
+                        GError **error)
 {
        const gchar *install_method;
        const gchar *filename;
@@ -732,6 +730,20 @@ gs_plugin_app_install (GsPlugin *plugin,
 }
 
 /**
+ * gs_plugin_app_install:
+ *
+ * Called when a user double clicks on a .cab file
+ */
+gboolean
+gs_plugin_app_install (GsPlugin *plugin,
+                      GsApp *app,
+                      GCancellable *cancellable,
+                      GError **error)
+{
+       return gs_plugin_fwupd_install (plugin, app, cancellable, error);
+}
+
+/**
  * gs_plugin_app_update:
  *
  * This is only called when updating device firmware live.
@@ -761,7 +773,7 @@ gs_plugin_app_update (GsPlugin *plugin,
                                            cancellable, error);
        }
 
-       return gs_plugin_app_install (plugin, app, cancellable, error);
+       return gs_plugin_fwupd_install (plugin, app, cancellable, error);
 }
 
 /**


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]