diff --git a/fix-date-icons.patch b/fix-date-icons.patch deleted file mode 100644 index 700be2d..0000000 --- a/fix-date-icons.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 746b5b52c8469d5156a0a94fff4361ec3378246c Mon Sep 17 00:00:00 2001 -From: Hussam Al-Tayeb -Date: Thu, 22 Oct 2015 16:25:00 -0500 -Subject: [PATCH] Fix missing date icons in chat history window - -use x-office-calendar icon instead - -https://bugzilla.gnome.org/show_bug.cgi?id=756990 ---- - libempathy-gtk/empathy-log-window.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c -index d58de82..b3a66e7 100644 ---- a/libempathy-gtk/empathy-log-window.c -+++ b/libempathy-gtk/empathy-log-window.c -@@ -204,7 +204,7 @@ enum - COL_EVENTS_COUNT - }; - --#define CALENDAR_ICON "stock_calendar" -+#define CALENDAR_ICON "x-office-calendar" - - /* Seconds between two messages to be considered one conversation */ - #define MAX_GAP 30*60 diff --git a/fix-empathy-call.patch b/fix-empathy-call.patch deleted file mode 100644 index 0693a9b..0000000 --- a/fix-empathy-call.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 9f0d8a6e7444dd59729bac2c24717ea72aea5080 Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro -Date: Thu, 21 Jul 2016 20:48:12 -0500 -Subject: [PATCH] Revert "Don't call XInitThreads in Wayland" - -This reverts commit a9ede294c57bc5738be3c33cba4ef88b9a7d4a0e. - -It causes empathy-call to crash when run in X11, and fixes absolutely -nothing. See the bug for details. - -Thanks to Diane Trout for investigating and preparing a substantially- -identical patch. - -https://bugzilla.gnome.org/show_bug.cgi?id=767516 ---- - src/empathy-call.c | 9 +++------ - 1 file changed, 3 insertions(+), 6 deletions(-) - -diff --git a/src/empathy-call.c b/src/empathy-call.c -index 8821bf3..1ac8a79 100644 ---- a/src/empathy-call.c -+++ b/src/empathy-call.c -@@ -28,7 +28,6 @@ - #include - - #ifdef CLUTTER_WINDOWING_X11 --#include - #include - #endif - -@@ -216,11 +215,9 @@ main (int argc, - g_setenv ("GST_DEBUG_DUMP_DOT_DIR", g_get_tmp_dir (), FALSE); - - #ifdef GDK_WINDOWING_X11 -- if (GDK_IS_X11_DISPLAY (gdk_display_get_default ())) { -- /* We can't call clutter_gst_init() before gtk_clutter_init(), so no choice -- * but to intiialise X11 threading ourself */ -- XInitThreads (); -- } -+ /* We can't call clutter_gst_init() before gtk_clutter_init(), so no choice -+ * but to intiialise X11 threading ourself */ -+ XInitThreads (); - #endif - - optcontext = g_option_context_new (N_("- Empathy Audio/Video Client")); diff --git a/fix-reduce-accuracy-setting.patch b/fix-reduce-accuracy-setting.patch deleted file mode 100644 index ce43fb1..0000000 --- a/fix-reduce-accuracy-setting.patch +++ /dev/null @@ -1,46 +0,0 @@ -From f1b1b75e6772502290cbff5be2c8f31b61bdb6df Mon Sep 17 00:00:00 2001 -From: Fabrice Bellet -Date: Mon, 23 Mar 2015 01:30:50 +0100 -Subject: [PATCH] location-manager: fix reduce accuracy setting - -https://bugzilla.gnome.org/show_bug.cgi?id=746735 ---- - libempathy-gtk/empathy-location-manager.c | 17 +++++++++++++++++ - 1 file changed, 17 insertions(+) - -diff --git a/libempathy-gtk/empathy-location-manager.c b/libempathy-gtk/empathy-location-manager.c -index 8787eb2..6ba39ac 100644 ---- a/libempathy-gtk/empathy-location-manager.c -+++ b/libempathy-gtk/empathy-location-manager.c -@@ -368,6 +368,18 @@ publish_cb (GSettings *gsettings_loc, - } - - static void -+reduce_accuracy_cb (GSettings *gsettings_loc, -+ const gchar *key, -+ gpointer user_data) -+{ -+ EmpathyLocationManager *self = EMPATHY_LOCATION_MANAGER (user_data); -+ -+ DEBUG ("Reduce Accuracy changed"); -+ -+ self->priv->reduce_accuracy = g_settings_get_boolean (gsettings_loc, key); -+} -+ -+static void - account_manager_prepared_cb (GObject *source_object, - GAsyncResult *result, - gpointer user_data) -@@ -416,7 +428,12 @@ empathy_location_manager_init (EmpathyLocationManager *self) - "changed::" EMPATHY_PREFS_LOCATION_PUBLISH, - G_CALLBACK (publish_cb), self); - -+ g_signal_connect (priv->gsettings_loc, -+ "changed::" EMPATHY_PREFS_LOCATION_REDUCE_ACCURACY, -+ G_CALLBACK (reduce_accuracy_cb), self); -+ - publish_cb (priv->gsettings_loc, EMPATHY_PREFS_LOCATION_PUBLISH, self); -+ reduce_accuracy_cb (priv->gsettings_loc, EMPATHY_PREFS_LOCATION_REDUCE_ACCURACY, self); - } - - EmpathyLocationManager * diff --git a/fs-element-notifiers-crash.patch b/fs-element-notifiers-crash.patch deleted file mode 100644 index cfcad8b..0000000 --- a/fs-element-notifiers-crash.patch +++ /dev/null @@ -1,53 +0,0 @@ -From e07685ff5e93346a86690fcf1b8449bf934c8da4 Mon Sep 17 00:00:00 2001 -From: Fabrice Bellet -Date: Wed, 13 Jul 2016 16:00:05 +0200 -Subject: [PATCH] call-window: properly remove the fs element notifiers - -This patch removes the FsElementAddedNotifier from the pipeline -in the conference remove callback, instead of just unreferencing -them. This fixes a crash in the rtp-special-source stop thread -cleanup code. - -https://bugzilla.gnome.org/show_bug.cgi?id=768889 ---- - src/empathy-call-window.c | 19 ++++++++++++++++--- - 1 file changed, 16 insertions(+), 3 deletions(-) - -diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c -index a54346c..2bbbd0f 100644 ---- a/src/empathy-call-window.c -+++ b/src/empathy-call-window.c -@@ -2513,17 +2513,30 @@ empathy_call_window_conference_added_cb (EmpathyCallHandler *handler, - } - - static void -+empathy_call_window_add_notifier_remove (gpointer data, gpointer user_data) -+{ -+ EmpathyCallWindow *self = EMPATHY_CALL_WINDOW (user_data); -+ EmpathyCallWindowPriv *priv = GET_PRIV (self); -+ FsElementAddedNotifier *notifier = data; -+ -+ fs_element_added_notifier_remove (notifier, GST_BIN (priv->pipeline)); -+} -+ -+static void - empathy_call_window_conference_removed_cb (EmpathyCallHandler *handler, - GstElement *conference, gpointer user_data) - { - EmpathyCallWindow *self = EMPATHY_CALL_WINDOW (user_data); - EmpathyCallWindowPriv *priv = GET_PRIV (self); - -- g_list_free_full (priv->notifiers, g_object_unref); -- priv->notifiers = NULL; -- - gst_bin_remove (GST_BIN (priv->pipeline), conference); - gst_element_set_state (conference, GST_STATE_NULL); -+ -+ g_list_foreach (priv->notifiers, -+ empathy_call_window_add_notifier_remove, user_data); -+ -+ g_list_free_full (priv->notifiers, g_object_unref); -+ priv->notifiers = NULL; - } - - static gboolean