diff options
-rw-r--r-- | debian/changelog | 2 | ||||
-rw-r--r-- | debian/patches/01_lpi.patch | 8 | ||||
-rw-r--r-- | debian/patches/02_notifications_focus.patch | 2 | ||||
-rw-r--r-- | debian/patches/20_libindicate.patch | 26 | ||||
-rw-r--r-- | debian/patches/23_idomessagedialog_for_voip_and_ft.patch | 12 | ||||
-rw-r--r-- | debian/patches/31_really_raise_window.patch | 2 | ||||
-rw-r--r-- | debian/patches/40_unity_launcher_count.patch | 12 |
7 files changed, 33 insertions, 31 deletions
diff --git a/debian/changelog b/debian/changelog index 03b842589..44a205781 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ empathy (2.34.0+git.20110429.1c68ea-0ubuntu0+easton1) natty; urgency=low * New upstream snapshot. + + debian/patches/*: + - Refreshed. -- Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> Fri, 29 Apr 2011 16:01:08 +0100 diff --git a/debian/patches/01_lpi.patch b/debian/patches/01_lpi.patch index 234872333..ae6ad116d 100644 --- a/debian/patches/01_lpi.patch +++ b/debian/patches/01_lpi.patch @@ -1,7 +1,7 @@ === modified file 'configure.ac' --- a/configure.ac +++ b/configure.ac -@@ -161,6 +161,7 @@ +@@ -164,6 +164,7 @@ telepathy-glib >= $TELEPATHY_GLIB_REQUIRED telepathy-logger-0.2 >= $TELEPATHY_LOGGER x11 @@ -21,7 +21,7 @@ #include <telepathy-glib/telepathy-glib.h> #include <libempathy/empathy-contact.h> -@@ -2090,6 +2093,9 @@ +@@ -2144,6 +2147,9 @@ chat_window_chat_manager_chats_changed_cb (priv->chat_manager, empathy_chat_manager_get_num_chats (priv->chat_manager), window); @@ -53,7 +53,7 @@ #include <libempathy/empathy-contact.h> #include <libempathy/empathy-idle.h> #include <libempathy/empathy-utils.h> -@@ -2112,6 +2115,8 @@ +@@ -2441,6 +2444,8 @@ main_window_notify_contact_list_size_cb (priv->gsettings_ui, EMPATHY_PREFS_UI_SHOW_AVATARS, window); @@ -64,7 +64,7 @@ GtkWidget * --- a/src/empathy-main-window.ui +++ b/src/empathy-main-window.ui -@@ -277,6 +277,7 @@ +@@ -287,6 +287,7 @@ <menu action="help"> <menuitem action="help_contents"/> <menuitem action="help_debug"/> diff --git a/debian/patches/02_notifications_focus.patch b/debian/patches/02_notifications_focus.patch index 1156207b2..4187a8828 100644 --- a/debian/patches/02_notifications_focus.patch +++ b/debian/patches/02_notifications_focus.patch @@ -3,7 +3,7 @@ ## Bug: bug URL --- a/data/org.gnome.Empathy.gschema.xml.in +++ b/data/org.gnome.Empathy.gschema.xml.in -@@ -153,7 +153,7 @@ +@@ -158,7 +158,7 @@ <_description>Whether to show popup notifications when away or busy.</_description> </key> <key name="notifications-focus" type="b"> diff --git a/debian/patches/20_libindicate.patch b/debian/patches/20_libindicate.patch index ff78d8bf8..5d5812edf 100644 --- a/debian/patches/20_libindicate.patch +++ b/debian/patches/20_libindicate.patch @@ -10,7 +10,7 @@ # telepathy-yell prev_top_build_prefix=$ac_top_build_prefix -@@ -480,6 +482,34 @@ +@@ -498,6 +500,34 @@ AC_SUBST(MEEGO_LIBS) # ----------------------------------------------------------- @@ -45,7 +45,7 @@ # nautilus-sendto # ----------------------------------------------------------- AC_ARG_ENABLE(nautilus-sendto, -@@ -581,6 +611,7 @@ +@@ -599,6 +629,7 @@ CA Cert Path................: ${GTLS_SYSTEM_CA_FILE} Features: @@ -55,7 +55,7 @@ Location awareness (Geoclue): ${have_geoclue} --- a/data/org.gnome.Empathy.gschema.xml.in +++ b/data/org.gnome.Empathy.gschema.xml.in -@@ -86,6 +86,11 @@ +@@ -91,6 +91,11 @@ <_summary>The position for the chat window side pane</_summary> <_description>The stored position (in pixels) of the chat window side pane.</_description> </key> @@ -133,7 +133,7 @@ --- a/po/POTFILES.in +++ b/po/POTFILES.in -@@ -97,6 +97,8 @@ +@@ -98,6 +98,8 @@ [type: gettext/glade]src/empathy-ft-manager.ui src/empathy-import-dialog.c src/empathy-import-widget.c @@ -222,7 +222,7 @@ GtkTargetList *contact_targets; GtkTargetList *file_targets; -@@ -1278,6 +1287,72 @@ +@@ -1330,6 +1339,72 @@ } } @@ -295,7 +295,7 @@ static void chat_window_show_or_update_notification (EmpathyChatWindow *window, EmpathyMessage *message, -@@ -1454,6 +1529,9 @@ +@@ -1508,6 +1583,9 @@ empathy_sound_play (GTK_WIDGET (priv->dialog), EMPATHY_SOUND_MESSAGE_INCOMING); @@ -305,7 +305,7 @@ /* Pending messages have already been displayed in the approver, so we don't * display a notification for those. */ -@@ -1526,6 +1604,10 @@ +@@ -1580,6 +1658,10 @@ empathy_chat_messages_read (chat); chat_window_update_chat_tab (chat); @@ -316,7 +316,7 @@ } static void -@@ -1642,6 +1724,11 @@ +@@ -1696,6 +1778,11 @@ /* Update the title, since we now mark all unread messages as read. */ chat_window_update_chat_tab_full (priv->current_chat, FALSE); @@ -328,7 +328,7 @@ return FALSE; } -@@ -1986,6 +2073,11 @@ +@@ -2040,6 +2127,11 @@ g_object_unref (gui); priv->chatroom_manager = empathy_chatroom_manager_dup_singleton (NULL); @@ -1299,7 +1299,7 @@ #define DEBUG_FLAG EMPATHY_DEBUG_OTHER #include <libempathy/empathy-debug.h> -@@ -161,6 +165,10 @@ +@@ -165,6 +169,10 @@ /* Actions that are enabled when there are connected accounts */ GList *actions_connected; @@ -1310,7 +1310,7 @@ /* The idle event source to migrate butterfly's logs */ guint butterfly_log_migration_members_changed_id; -@@ -433,11 +441,23 @@ +@@ -437,11 +445,23 @@ EmpathyEvent *event, EmpathyMainWindow *window) { @@ -1334,7 +1334,7 @@ } static void -@@ -1004,6 +1024,10 @@ +@@ -1321,6 +1341,10 @@ g_object_unref (priv->ui_manager); g_object_unref (priv->chatroom_manager); @@ -1345,7 +1345,7 @@ g_object_unref (priv->gsettings_ui); g_object_unref (priv->gsettings_contacts); -@@ -2072,6 +2096,10 @@ +@@ -2401,6 +2425,10 @@ l = l->next; } diff --git a/debian/patches/23_idomessagedialog_for_voip_and_ft.patch b/debian/patches/23_idomessagedialog_for_voip_and_ft.patch index f6b701fbf..fa944f9f3 100644 --- a/debian/patches/23_idomessagedialog_for_voip_and_ft.patch +++ b/debian/patches/23_idomessagedialog_for_voip_and_ft.patch @@ -3,13 +3,13 @@ +++ b/configure.ac @@ -44,6 +44,7 @@ TELEPATHY_GLIB_REQUIRED=0.14.1 - TELEPATHY_LOGGER=0.2.0 + TELEPATHY_LOGGER=0.2.8 UNIQUE_REQUIRED=1.1.2 +IDO_REQUIRED=0.1.14 # Optionnal deps CLUTTER_GTK_REQUIRED=0.10 -@@ -162,6 +163,7 @@ +@@ -165,6 +166,7 @@ libxml-2.0 telepathy-glib >= $TELEPATHY_GLIB_REQUIRED telepathy-logger-0.2 >= $TELEPATHY_LOGGER @@ -29,7 +29,7 @@ #include "empathy-event-manager.h" #include "empathy-main-window.h" -@@ -473,6 +476,7 @@ +@@ -474,6 +477,7 @@ } } @@ -37,7 +37,7 @@ static void event_manager_call_window_confirmation_dialog_response_cb (GtkDialog *dialog, gint response, gpointer user_data) -@@ -499,13 +503,75 @@ +@@ -500,13 +504,75 @@ } static void @@ -114,7 +114,7 @@ EmpathyEventType etype = event->public.type; if (event->approval->dialog != NULL) -@@ -532,33 +598,33 @@ +@@ -533,33 +599,33 @@ return; } @@ -167,7 +167,7 @@ gtk_message_dialog_set_image (GTK_MESSAGE_DIALOG (dialog), image); gtk_widget_show (image); -@@ -955,7 +1021,7 @@ +@@ -956,7 +1022,7 @@ event_manager_add (approval->manager, NULL, approval->contact, EMPATHY_EVENT_TYPE_TRANSFER, EMPATHY_IMAGE_DOCUMENT_SEND, header, NULL, diff --git a/debian/patches/31_really_raise_window.patch b/debian/patches/31_really_raise_window.patch index b4a7a5206..c6a0e7f9b 100644 --- a/debian/patches/31_really_raise_window.patch +++ b/debian/patches/31_really_raise_window.patch @@ -64,7 +64,7 @@ Bug: https://bugs.launchpad.net/bugs/442389 #include <libido/idomessagedialog.h> #include <libempathy-gtk/empathy-ui-utils.h> -@@ -513,7 +514,7 @@ +@@ -514,7 +515,7 @@ if (event->approval->dialog != NULL) { diff --git a/debian/patches/40_unity_launcher_count.patch b/debian/patches/40_unity_launcher_count.patch index ed35e5c51..fa0fe2866 100644 --- a/debian/patches/40_unity_launcher_count.patch +++ b/debian/patches/40_unity_launcher_count.patch @@ -9,7 +9,7 @@ # telepathy-yell prev_top_build_prefix=$ac_top_build_prefix -@@ -506,12 +507,41 @@ +@@ -524,12 +525,41 @@ fi if test "x$enable_libindicate" = "xyes" -a "x$have_libindicate" != "xyes"; then @@ -52,7 +52,7 @@ # nautilus-sendto # ----------------------------------------------------------- AC_ARG_ENABLE(nautilus-sendto, -@@ -614,6 +644,7 @@ +@@ -632,6 +662,7 @@ Features: Message indicator support (libindicate): ${have_libindicate} @@ -109,7 +109,7 @@ GtkTargetList *contact_targets; GtkTargetList *file_targets; -@@ -1329,8 +1336,19 @@ +@@ -1381,8 +1388,19 @@ sender, body); g_signal_connect (indicator, "activate", G_CALLBACK (chat_window_indicator_activate_cb), chat); @@ -130,7 +130,7 @@ } empathy_indicator_show (indicator); } -@@ -1347,6 +1365,25 @@ +@@ -1399,6 +1417,25 @@ DEBUG ("indicator is %p", indicator); empathy_indicator_hide (indicator); g_hash_table_remove (priv->indicators, chat); @@ -156,7 +156,7 @@ } else { DEBUG ("indicator is NULL, nothing to remove"); } -@@ -1980,6 +2017,11 @@ +@@ -2034,6 +2071,11 @@ priv->chat_manager = NULL; } @@ -168,7 +168,7 @@ chat_windows = g_list_remove (chat_windows, window); gtk_widget_destroy (priv->dialog); -@@ -2078,6 +2120,9 @@ +@@ -2132,6 +2174,9 @@ priv->indicators = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, g_object_unref); #endif |