From a9d469b1b48a8446dc9b9fd987b6af83a60ed796 Mon Sep 17 00:00:00 2001 From: Simon Quigley Date: Mon, 19 Jun 2017 14:38:42 -0500 Subject: Import Upstream version 0.4.2.1.svn30042007 --- arch/linux/alpha/battery.h | 1 + arch/linux/ia64/battery.h | 1 + arch/linux/s390/battery.h | 1 + configure | 4 ++-- shell.c | 1 - syncmanager.c | 4 ++++ syncmanager.h | 1 + 7 files changed, 10 insertions(+), 3 deletions(-) create mode 120000 arch/linux/alpha/battery.h create mode 120000 arch/linux/ia64/battery.h create mode 120000 arch/linux/s390/battery.h diff --git a/arch/linux/alpha/battery.h b/arch/linux/alpha/battery.h new file mode 120000 index 00000000..ed7360e1 --- /dev/null +++ b/arch/linux/alpha/battery.h @@ -0,0 +1 @@ +../../../arch/linux/common/battery.h \ No newline at end of file diff --git a/arch/linux/ia64/battery.h b/arch/linux/ia64/battery.h new file mode 120000 index 00000000..ed7360e1 --- /dev/null +++ b/arch/linux/ia64/battery.h @@ -0,0 +1 @@ +../../../arch/linux/common/battery.h \ No newline at end of file diff --git a/arch/linux/s390/battery.h b/arch/linux/s390/battery.h new file mode 120000 index 00000000..ed7360e1 --- /dev/null +++ b/arch/linux/s390/battery.h @@ -0,0 +1 @@ +../../../arch/linux/common/battery.h \ No newline at end of file diff --git a/configure b/configure index 80906b62..a5ac9eb8 100755 --- a/configure +++ b/configure @@ -154,8 +154,8 @@ for i in `which pkg-config`; do --atleast-version=$MIN_VERSION > /dev/null case $? in 0) - SOUP_FLAGS=`pkg-config libsoup-2.2 --cflags` - SOUP_LIBS=`pkg-config libsoup-2.2 --libs` + SOUP_FLAGS=`pkg-config libsoup-2.2 --cflags --static` + SOUP_LIBS=`pkg-config libsoup-2.2 --libs --static` echo "found `pkg-config libsoup-2.2 --modversion`" SOUP=1 break ;; diff --git a/shell.c b/shell.c index 228ce9ee..6d4d469d 100644 --- a/shell.c +++ b/shell.c @@ -520,7 +520,6 @@ static void add_modules_to_gui(gpointer data, gpointer user_data) } } - void shell_init(GSList * modules) { if (shell) { diff --git a/syncmanager.c b/syncmanager.c index 6602407a..7646990f 100644 --- a/syncmanager.c +++ b/syncmanager.c @@ -299,6 +299,10 @@ static void _action_call_function_got_response(SoupMessage *msg, gpointer user_d #endif g_free(filename); } + + if (sna->entry->callback) { + sna->entry->callback(sna->entry, string); + } g_free(string); g_main_quit(loop); diff --git a/syncmanager.h b/syncmanager.h index 9cd812d0..78ca2153 100644 --- a/syncmanager.h +++ b/syncmanager.h @@ -29,6 +29,7 @@ struct _SyncEntry { gchar *save_to; gchar *(*get_data)(void); + void (*callback)(SyncEntry *entry, const gchar *response); gboolean selected; }; -- cgit v1.2.3