Refresh patchesdebian/2.33.4+git.20110318.9d0904-0ubuntu0+easton1

9 files changed, 106 insertions, 255 deletions

diff --git a/debian/changelog b/debian/changelog
index 383fa7625..4007f6b5a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ empathy (2.33.4+git.20110318.9d0904-0ubuntu0+easton1) natty; urgency=low
 
   * New upstream snapshot.
   * Sync patches with Ubuntu.
+  * Refresh patches.
 
  -- Emilio Pozuelo Monfort <pochu@debian.org>  Fri, 18 Mar 2011 19:00:06 +0000
 
diff --git a/debian/patches/01_lpi.patch b/debian/patches/01_lpi.patch
index 75aa05b1b..234872333 100644
--- a/debian/patches/01_lpi.patch
+++ b/debian/patches/01_lpi.patch
@@ -1,7 +1,7 @@
 === modified file 'configure.ac'
---- old/configure.ac	2011-02-24 17:01:06 +0000
-+++ new/configure.ac	2011-02-24 17:01:49 +0000
-@@ -160,6 +160,7 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -161,6 +161,7 @@
     telepathy-glib >= $TELEPATHY_GLIB_REQUIRED
     telepathy-logger-0.2 >= $TELEPATHY_LOGGER
     x11
@@ -9,10 +9,8 @@
  ])
  
  PKG_CHECK_MODULES(YELL, [telepathy-yell])
-
-=== modified file 'src/empathy-chat-window.c'
---- old/src/empathy-chat-window.c	2011-02-24 17:01:06 +0000
-+++ new/src/empathy-chat-window.c	2011-02-24 17:01:49 +0000
+--- a/src/empathy-chat-window.c
++++ b/src/empathy-chat-window.c
 @@ -36,6 +36,9 @@
  #include <glib/gi18n.h>
  #include <libnotify/notification.h>
@@ -23,7 +21,7 @@
  #include <telepathy-glib/telepathy-glib.h>
  
  #include <libempathy/empathy-contact.h>
-@@ -2069,6 +2072,9 @@
+@@ -2090,6 +2093,9 @@
  	chat_window_chat_manager_chats_changed_cb (priv->chat_manager,
  						   empathy_chat_manager_get_num_chats (priv->chat_manager),
  						   window);
@@ -33,10 +31,8 @@
  }
  
  EmpathyChatWindow *
-
-=== modified file 'src/empathy-chat-window.ui'
---- old/src/empathy-chat-window.ui	2011-02-24 17:01:06 +0000
-+++ new/src/empathy-chat-window.ui	2011-02-24 17:01:49 +0000
+--- a/src/empathy-chat-window.ui
++++ b/src/empathy-chat-window.ui
 @@ -197,6 +197,7 @@
          </menu>
          <menu action="menu_help">
@@ -45,10 +41,8 @@
            <menuitem action="menu_help_about"/>
          </menu>
        </menubar>
-
-=== modified file 'src/empathy-main-window.c'
---- old/src/empathy-main-window.c	2011-02-24 17:01:06 +0000
-+++ new/src/empathy-main-window.c	2011-02-24 17:01:49 +0000
+--- a/src/empathy-main-window.c
++++ b/src/empathy-main-window.c
 @@ -33,6 +33,9 @@
  #include <telepathy-glib/util.h>
  #include <folks/folks.h>
@@ -59,7 +53,7 @@
  #include <libempathy/empathy-contact.h>
  #include <libempathy/empathy-idle.h>
  #include <libempathy/empathy-utils.h>
-@@ -1973,6 +1976,8 @@
+@@ -2112,6 +2115,8 @@
  	main_window_notify_contact_list_size_cb (priv->gsettings_ui,
  						 EMPATHY_PREFS_UI_SHOW_AVATARS,
  						 window);
@@ -68,10 +62,8 @@
  }
  
  GtkWidget *
-
-=== modified file 'src/empathy-main-window.ui'
---- old/src/empathy-main-window.ui	2011-02-24 17:01:06 +0000
-+++ new/src/empathy-main-window.ui	2011-02-24 17:01:49 +0000
+--- a/src/empathy-main-window.ui
++++ b/src/empathy-main-window.ui
 @@ -277,6 +277,7 @@
          <menu action="help">
            <menuitem action="help_contents"/>
@@ -80,4 +72,3 @@
            <menuitem action="help_about"/>
          </menu>
        </menubar>
-
diff --git a/debian/patches/02_notifications_focus.patch b/debian/patches/02_notifications_focus.patch
index 498716d52..1156207b2 100644
--- a/debian/patches/02_notifications_focus.patch
+++ b/debian/patches/02_notifications_focus.patch
@@ -1,10 +1,8 @@
 ## Description: add some description
 ## Origin/Author: add some origin or author
 ## Bug: bug URL
-Index: empathy-2.31.6/data/org.gnome.Empathy.gschema.xml.in
-===================================================================
---- empathy-2.31.6.orig/data/org.gnome.Empathy.gschema.xml.in	2010-07-13 22:26:34.000000000 +1000
-+++ empathy-2.31.6/data/org.gnome.Empathy.gschema.xml.in	2010-08-05 17:30:05.022584053 +1000
+--- a/data/org.gnome.Empathy.gschema.xml.in
++++ b/data/org.gnome.Empathy.gschema.xml.in
 @@ -153,7 +153,7 @@
        <_description>Whether to show popup notifications when away or busy.</_description>
      </key>
diff --git a/debian/patches/20_libindicate.patch b/debian/patches/20_libindicate.patch
index afaf6ae30..e9de8498e 100644
--- a/debian/patches/20_libindicate.patch
+++ b/debian/patches/20_libindicate.patch
@@ -1,7 +1,7 @@
 === modified file 'configure.ac'
---- old/configure.ac	2011-02-24 17:03:13 +0000
-+++ new/configure.ac	2011-02-24 17:03:53 +0000
-@@ -55,6 +55,8 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -56,6 +56,8 @@
  NETWORK_MANAGER_REQUIRED=0.7.0
  WEBKIT_REQUIRED=1.1.15
  GNOME_CONTROL_CENTER_GTK3_REQUIRED=2.31.4
@@ -10,7 +10,7 @@
  
  # telepathy-yell
  prev_top_build_prefix=$ac_top_build_prefix
-@@ -480,6 +482,34 @@
+@@ -481,6 +483,34 @@
  AC_SUBST(MEEGO_LIBS)
  
  # -----------------------------------------------------------
@@ -45,7 +45,7 @@
  # nautilus-sendto
  # -----------------------------------------------------------
  AC_ARG_ENABLE(nautilus-sendto,
-@@ -581,6 +611,7 @@
+@@ -582,6 +612,7 @@
  	CA Cert Path................:  ${GTLS_SYSTEM_CA_FILE}
  
      Features:
@@ -53,10 +53,8 @@
  	Spell checking (enchant)....:  ${have_enchant}
  	Display maps (libchamplain).:  ${have_libchamplain}
  	Location awareness (Geoclue):  ${have_geoclue}
-
-=== modified file 'data/org.gnome.Empathy.gschema.xml.in'
---- old/data/org.gnome.Empathy.gschema.xml.in	2011-02-24 17:03:47 +0000
-+++ new/data/org.gnome.Empathy.gschema.xml.in	2011-02-24 17:03:53 +0000
+--- a/data/org.gnome.Empathy.gschema.xml.in
++++ b/data/org.gnome.Empathy.gschema.xml.in
 @@ -86,6 +86,11 @@
        <_summary>The position for the chat window side pane</_summary>
        <_description>The stored position (in pixels) of the chat window side pane.</_description>
@@ -69,10 +67,8 @@
    </schema>
    <schema id="org.gnome.Empathy.contacts" path="/apps/empathy/contacts/">
      <key name="sort-criterium" type="s">
-
-=== modified file 'libempathy-gtk/empathy-ui-utils.c'
---- old/libempathy-gtk/empathy-ui-utils.c	2011-02-24 17:01:06 +0000
-+++ new/libempathy-gtk/empathy-ui-utils.c	2011-02-24 17:03:53 +0000
+--- a/libempathy-gtk/empathy-ui-utils.c
++++ b/libempathy-gtk/empathy-ui-utils.c
 @@ -1564,25 +1564,36 @@
  	Display      *dpy;
  	GdkWindow    *gdk_window;
@@ -80,12 +76,22 @@
 -	gtk_status_icon_get_geometry (status_icon, NULL, &icon_location, NULL);
 -	gdk_window = gtk_widget_get_window (GTK_WIDGET (window));
 -	dpy = gdk_x11_drawable_get_xdisplay (gdk_window);
--
++	// If the status icon isn't visible (because indicators are used) then
++	// attempting to change the properties of the status icon doesn't work.
++	if (gtk_status_icon_get_visible (status_icon)) {
++		gtk_status_icon_get_geometry (status_icon, NULL, &icon_location, NULL);
++		gdk_window = gtk_widget_get_window (GTK_WIDGET (window));
++		dpy = gdk_x11_drawable_get_xdisplay (gdk_window);
+ 
 -	data[0] = icon_location.x;
 -	data[1] = icon_location.y;
 -	data[2] = icon_location.width;
 -	data[3] = icon_location.height;
--
++		data[0] = icon_location.x;
++		data[1] = icon_location.y;
++		data[2] = icon_location.width;
++		data[3] = icon_location.height;
+ 
 -	XChangeProperty (dpy,
 -			 GDK_WINDOW_XID (gdk_window),
 -			 gdk_x11_get_xatom_by_name_for_display (
@@ -93,18 +99,6 @@
 -			 "_NET_WM_ICON_GEOMETRY"),
 -			 XA_CARDINAL, 32, PropModeReplace,
 -			 (guchar *)&data, 4);
-+	// If the status icon isn't visible (because indicators are used) then
-+	// attempting to change the properties of the status icon doesn't work.
-+	if (gtk_status_icon_get_visible (status_icon)) {
-+		gtk_status_icon_get_geometry (status_icon, NULL, &icon_location, NULL);
-+		gdk_window = gtk_widget_get_window (GTK_WIDGET (window));
-+		dpy = gdk_x11_drawable_get_xdisplay (gdk_window);
-+
-+		data[0] = icon_location.x;
-+		data[1] = icon_location.y;
-+		data[2] = icon_location.width;
-+		data[3] = icon_location.height;
-+
 +		XChangeProperty (dpy,
 +				 GDK_WINDOW_XID (gdk_window),
 +				 gdk_x11_get_xatom_by_name_for_display (
@@ -127,10 +121,8 @@
  }
  
  /* Takes care of moving the window to the current workspace. */
-
-=== modified file 'libempathy/empathy-gsettings.h'
---- old/libempathy/empathy-gsettings.h	2011-02-24 17:01:06 +0000
-+++ new/libempathy/empathy-gsettings.h	2011-02-24 17:03:53 +0000
+--- a/libempathy/empathy-gsettings.h
++++ b/libempathy/empathy-gsettings.h
 @@ -71,6 +71,7 @@
  #define EMPATHY_PREFS_UI_SHOW_AVATARS              "show-avatars"
  #define EMPATHY_PREFS_UI_SHOW_PROTOCOLS            "show-protocols"
@@ -139,11 +131,9 @@
  #define EMPATHY_PREFS_UI_CHAT_WINDOW_PANED_POS     "chat-window-paned-pos"
  #define EMPATHY_PREFS_UI_SHOW_OFFLINE              "show-offline"
  
-
-=== modified file 'po/POTFILES.in'
---- old/po/POTFILES.in	2011-02-24 17:01:06 +0000
-+++ new/po/POTFILES.in	2011-02-24 17:03:53 +0000
-@@ -94,6 +94,8 @@
+--- a/po/POTFILES.in
++++ b/po/POTFILES.in
+@@ -97,6 +97,8 @@
  [type: gettext/glade]src/empathy-ft-manager.ui
  src/empathy-import-dialog.c
  src/empathy-import-widget.c
@@ -152,10 +142,8 @@
  [type: gettext/glade]src/empathy-import-dialog.ui
  src/empathy-import-widget.c
  src/empathy-main-window.c
-
-=== modified file 'src/Makefile.am'
---- old/src/Makefile.am	2011-02-24 17:01:06 +0000
-+++ new/src/Makefile.am	2011-02-24 17:03:53 +0000
+--- a/src/Makefile.am
++++ b/src/Makefile.am
 @@ -8,6 +8,7 @@
  	$(ERROR_CFLAGS)					\
  	-I$(top_srcdir)                          	\
@@ -180,7 +168,7 @@
  	$(UNIQUE_LIBS)						\
  	$(EMPATHY_LIBS)						\
  	$(GTK_LIBS)						\
-@@ -199,6 +202,7 @@
+@@ -200,6 +203,7 @@
          $(LIBNOTIFY_LIBS)						\
          $(UNIQUE_LIBS)						\
          $(EMPATHY_LIBS)							\
@@ -188,7 +176,7 @@
          $(LIBCHAMPLAIN_LIBS)						\
          $(WEBKIT_LIBS)							\
  	$(NULL)
-@@ -231,6 +235,18 @@
+@@ -232,6 +236,18 @@
  	$(autostart_DATA)	\
  	$(ui_DATA)
  
@@ -207,10 +195,8 @@
  if HAVE_LIBCHAMPLAIN
  empathy_handwritten_source += 				\
  	empathy-map-view.c			\
-
-=== modified file 'src/empathy-chat-window.c'
---- old/src/empathy-chat-window.c	2011-02-24 17:03:13 +0000
-+++ new/src/empathy-chat-window.c	2011-02-24 17:03:53 +0000
+--- a/src/empathy-chat-window.c
++++ b/src/empathy-chat-window.c
 @@ -63,6 +63,11 @@
  #include "empathy-about-dialog.h"
  #include "empathy-invite-participant-dialog.h"
@@ -236,7 +222,7 @@
  	GtkTargetList *contact_targets;
  	GtkTargetList *file_targets;
  
-@@ -1257,6 +1266,72 @@
+@@ -1278,6 +1287,72 @@
  	}
  }
  
@@ -309,7 +295,7 @@
  static void
  chat_window_show_or_update_notification (EmpathyChatWindow *window,
  					 EmpathyMessage *message,
-@@ -1433,6 +1508,9 @@
+@@ -1454,6 +1529,9 @@
  
  		empathy_sound_play (GTK_WIDGET (priv->dialog),
  		    EMPATHY_SOUND_MESSAGE_INCOMING);
@@ -319,7 +305,7 @@
  
  		/* Pending messages have already been displayed in the approver, so we don't
  		* display a notification for those. */
-@@ -1505,6 +1583,10 @@
+@@ -1526,6 +1604,10 @@
  	empathy_chat_messages_read (chat);
  
  	chat_window_update_chat_tab (chat);
@@ -330,9 +316,9 @@
  }
  
  static void
-@@ -1621,6 +1703,11 @@
+@@ -1642,6 +1724,11 @@
  	/* Update the title, since we now mark all unread messages as read. */
- 	chat_window_update_chat_tab (priv->current_chat);
+ 	chat_window_update_chat_tab_full (priv->current_chat, FALSE);
  
 +#ifdef HAVE_LIBINDICATE
 +	/* Remove the indicator for the active chat */
@@ -342,7 +328,7 @@
  	return FALSE;
  }
  
-@@ -1965,6 +2052,11 @@
+@@ -1986,6 +2073,11 @@
  	g_object_unref (gui);
  
  	priv->chatroom_manager = empathy_chatroom_manager_dup_singleton (NULL);
@@ -354,10 +340,8 @@
  
  	priv->notebook = gtk_notebook_new ();
  	gtk_notebook_set_group (GTK_NOTEBOOK (priv->notebook), "EmpathyChatWindow");
-
-=== added file 'src/empathy-indicator-manager.c'
---- old/src/empathy-indicator-manager.c	1970-01-01 00:00:00 +0000
-+++ new/src/empathy-indicator-manager.c	2011-02-24 17:03:53 +0000
+--- /dev/null
++++ b/src/empathy-indicator-manager.c
 @@ -0,0 +1,467 @@
 +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 +/*
@@ -826,10 +810,8 @@
 +      G_CALLBACK (indicate_login_cb), manager);
 +  empathy_indicator_show (e_indicator);
 +}
-
-=== added file 'src/empathy-indicator-manager.h'
---- old/src/empathy-indicator-manager.h	1970-01-01 00:00:00 +0000
-+++ new/src/empathy-indicator-manager.h	2011-02-24 17:03:53 +0000
+--- /dev/null
++++ b/src/empathy-indicator-manager.h
 @@ -0,0 +1,77 @@
 +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 +/*
@@ -908,10 +890,8 @@
 +G_END_DECLS
 +
 +#endif /* __EMPATHY_INDICATOR_MANAGER_H__ */
-
-=== added file 'src/empathy-indicator.c'
---- old/src/empathy-indicator.c	1970-01-01 00:00:00 +0000
-+++ new/src/empathy-indicator.c	2011-02-24 17:03:53 +0000
+--- /dev/null
++++ b/src/empathy-indicator.c
 @@ -0,0 +1,325 @@
 +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 +/*
@@ -1238,10 +1218,8 @@
 +  g_object_get (e_indicator, "contact", &contact, NULL);
 +  return contact;
 +}
-
-=== added file 'src/empathy-indicator.h'
---- old/src/empathy-indicator.h	1970-01-01 00:00:00 +0000
-+++ new/src/empathy-indicator.h	2011-02-24 17:03:53 +0000
+--- /dev/null
++++ b/src/empathy-indicator.h
 @@ -0,0 +1,65 @@
 +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 +/*
@@ -1308,11 +1286,9 @@
 +
 +
 +#endif /* __EMPATHY-INDICATOR_H__ */
-
-=== modified file 'src/empathy-main-window.c'
---- old/src/empathy-main-window.c	2011-02-24 17:03:13 +0000
-+++ new/src/empathy-main-window.c	2011-02-24 17:03:53 +0000
-@@ -81,6 +81,10 @@
+--- a/src/empathy-main-window.c
++++ b/src/empathy-main-window.c
+@@ -82,6 +82,10 @@
  #include "empathy-ft-manager.h"
  #include "empathy-migrate-butterfly-logs.h"
  
@@ -1323,7 +1299,7 @@
  #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
  #include <libempathy/empathy-debug.h>
  
-@@ -159,6 +163,10 @@
+@@ -161,6 +165,10 @@
  
  	/* Actions that are enabled when there are connected accounts */
  	GList                  *actions_connected;
@@ -1334,7 +1310,7 @@
  
  	/* The idle event source to migrate butterfly's logs */
  	guint butterfly_log_migration_members_changed_id;
-@@ -431,11 +439,23 @@
+@@ -433,11 +441,23 @@
  			    EmpathyEvent        *event,
  			    EmpathyMainWindow   *window)
  {
@@ -1358,7 +1334,7 @@
  }
  
  static void
-@@ -867,6 +887,10 @@
+@@ -1004,6 +1024,10 @@
  	g_object_unref (priv->ui_manager);
  	g_object_unref (priv->chatroom_manager);
  
@@ -1369,7 +1345,7 @@
  	g_object_unref (priv->gsettings_ui);
  	g_object_unref (priv->gsettings_contacts);
  
-@@ -1933,6 +1957,10 @@
+@@ -2072,6 +2096,10 @@
  		l = l->next;
  	}
  
@@ -1380,10 +1356,8 @@
  	/* Show offline ? */
  	show_offline = g_settings_get_boolean (priv->gsettings_ui,
  					       EMPATHY_PREFS_UI_SHOW_OFFLINE);
-
-=== modified file 'src/empathy-preferences.c'
---- old/src/empathy-preferences.c	2011-02-24 17:01:06 +0000
-+++ new/src/empathy-preferences.c	2011-02-24 17:03:53 +0000
+--- a/src/empathy-preferences.c
++++ b/src/empathy-preferences.c
 @@ -56,6 +56,7 @@
  
  	GtkWidget *checkbutton_show_smileys;
@@ -1417,10 +1391,8 @@
  		"combobox_chat_theme", &priv->combobox_chat_theme,
  		"checkbutton_separate_chat_windows", &priv->checkbutton_separate_chat_windows,
  		"checkbutton_events_notif_area", &priv->checkbutton_events_notif_area,
-
-=== modified file 'src/empathy-preferences.ui'
---- old/src/empathy-preferences.ui	2011-02-24 17:01:06 +0000
-+++ new/src/empathy-preferences.ui	2011-02-24 17:03:53 +0000
+--- a/src/empathy-preferences.ui
++++ b/src/empathy-preferences.ui
 @@ -266,6 +266,20 @@
                      <property name="position">1</property>
                    </packing>
@@ -1442,10 +1414,8 @@
                </object>
                <packing>
                  <property name="position">1</property>
-
-=== modified file 'src/empathy-status-icon.c'
---- old/src/empathy-status-icon.c	2011-02-24 17:01:06 +0000
-+++ new/src/empathy-status-icon.c	2011-02-24 17:03:53 +0000
+--- a/src/empathy-status-icon.c
++++ b/src/empathy-status-icon.c
 @@ -29,6 +29,7 @@
  #include <gdk/gdkkeysyms.h>
  #include <glib/gi18n.h>
@@ -1680,4 +1650,3 @@
  	status_icon_set_visibility (icon, !should_hide, FALSE);
  
  	return icon;
-
diff --git a/debian/patches/31_really_raise_window.patch b/debian/patches/31_really_raise_window.patch
index 72278a2fa..253570aad 100644
--- a/debian/patches/31_really_raise_window.patch
+++ b/debian/patches/31_really_raise_window.patch
@@ -2,10 +2,8 @@ Description: Force focus of the window when selected from the indicator
 Bug: https://bugs.launchpad.net/bugs/442389
 
 === modified file 'libempathy-gtk/empathy-ui-utils.c'
-Index: empathy-2.33.1/libempathy-gtk/empathy-ui-utils.c
-===================================================================
---- empathy-2.33.1.orig/libempathy-gtk/empathy-ui-utils.c	2011-02-02 11:22:39.271459005 -0500
-+++ empathy-2.33.1/libempathy-gtk/empathy-ui-utils.c	2011-02-02 11:22:49.651459020 -0500
+--- a/libempathy-gtk/empathy-ui-utils.c
++++ b/libempathy-gtk/empathy-ui-utils.c
 @@ -1596,6 +1596,41 @@
  	}
  }
@@ -56,11 +54,9 @@ Index: empathy-2.33.1/libempathy-gtk/empathy-ui-utils.c
  }
  
  void
-Index: empathy-2.33.1/src/empathy-event-manager.c
-===================================================================
---- empathy-2.33.1.orig/src/empathy-event-manager.c	2011-02-02 11:22:44.251459011 -0500
-+++ empathy-2.33.1/src/empathy-event-manager.c	2011-02-02 11:22:49.651459020 -0500
-@@ -44,6 +44,7 @@
+--- a/src/empathy-event-manager.c
++++ b/src/empathy-event-manager.c
+@@ -47,6 +47,7 @@
  #include <libempathy-gtk/empathy-images.h>
  #include <libempathy-gtk/empathy-contact-dialogs.h>
  #include <libempathy-gtk/empathy-sound.h>
@@ -68,7 +64,7 @@ Index: empathy-2.33.1/src/empathy-event-manager.c
  
  #include <libido/idomessagedialog.h>
  #include <libempathy-gtk/empathy-ui-utils.h>
-@@ -495,7 +496,7 @@
+@@ -504,7 +505,7 @@
  
    if (event->approval->dialog != NULL)
      {
diff --git a/debian/patches/34_start_raised_execpt_in_session.patch b/debian/patches/34_start_raised_execpt_in_session.patch
index f7cc2cf82..e83aa7408 100644
--- a/debian/patches/34_start_raised_execpt_in_session.patch
+++ b/debian/patches/34_start_raised_execpt_in_session.patch
@@ -2,11 +2,9 @@ Description: If not started with the session, we should always raise
 Bug: bugs.launchpad.net/bugs/503052
 
 === modified file 'src/empathy-status-icon.c'
-Index: empathy-2.33.1/src/empathy-status-icon.c
-===================================================================
---- empathy-2.33.1.orig/src/empathy-status-icon.c	2011-02-02 11:22:44.251459011 -0500
-+++ empathy-2.33.1/src/empathy-status-icon.c	2011-02-02 11:22:52.711459000 -0500
-@@ -865,6 +865,9 @@
+--- a/src/empathy-status-icon.c
++++ b/src/empathy-status-icon.c
+@@ -864,6 +864,9 @@
  #ifdef HAVE_LIBINDICATE
  	gboolean               use_libindicate;
  #endif
@@ -16,7 +14,7 @@ Index: empathy-2.33.1/src/empathy-status-icon.c
  
  	g_return_val_if_fail (GTK_IS_WINDOW (window), NULL);
  
-@@ -900,8 +903,16 @@
+@@ -899,8 +902,16 @@
  			  icon);
  
  	if (!hide_contact_list) {
diff --git a/debian/patches/40_unity_launcher_count.patch b/debian/patches/40_unity_launcher_count.patch
index d2e2e3193..cd847df64 100644
--- a/debian/patches/40_unity_launcher_count.patch
+++ b/debian/patches/40_unity_launcher_count.patch
@@ -1,7 +1,7 @@
 === modified file 'configure.ac'
---- old/configure.ac	2011-02-24 17:06:45 +0000
-+++ new/configure.ac	2011-02-24 17:09:26 +0000
-@@ -58,6 +58,7 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -59,6 +59,7 @@
  GNOME_CONTROL_CENTER_GTK3_REQUIRED=2.31.4
  INDICATE_REQUIRED=0.4.91
  INDICATE_GTK_REQUIRED=0.4.91
@@ -9,7 +9,7 @@
  
  # telepathy-yell
  prev_top_build_prefix=$ac_top_build_prefix
-@@ -506,12 +507,41 @@
+@@ -507,12 +508,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 @@
+@@ -615,6 +645,7 @@
  
      Features:
  	Message indicator support (libindicate):  ${have_libindicate}
@@ -60,10 +60,8 @@
  	Spell checking (enchant)....:  ${have_enchant}
  	Display maps (libchamplain).:  ${have_libchamplain}
  	Location awareness (Geoclue):  ${have_geoclue}
-
-=== modified file 'src/Makefile.am'
---- old/src/Makefile.am	2011-02-24 17:04:31 +0000
-+++ new/src/Makefile.am	2011-02-24 17:09:26 +0000
+--- a/src/Makefile.am
++++ b/src/Makefile.am
 @@ -19,6 +19,7 @@
  	$(CPPFLAGS_COMMON)				\
  	$(LIBNOTIFY_CFLAGS)				\
@@ -80,7 +78,7 @@
  	$(UNIQUE_LIBS)						\
  	$(EMPATHY_LIBS)						\
  	$(GTK_LIBS)						\
-@@ -203,6 +205,7 @@
+@@ -204,6 +206,7 @@
          $(UNIQUE_LIBS)						\
          $(EMPATHY_LIBS)							\
  	$(INDICATE_LIBS)						\
@@ -88,10 +86,8 @@
          $(LIBCHAMPLAIN_LIBS)						\
          $(WEBKIT_LIBS)							\
  	$(NULL)
-
-=== modified file 'src/empathy-chat-window.c'
---- old/src/empathy-chat-window.c	2011-02-24 17:04:31 +0000
-+++ new/src/empathy-chat-window.c	2011-02-24 17:09:26 +0000
+--- a/src/empathy-chat-window.c
++++ b/src/empathy-chat-window.c
 @@ -71,6 +71,10 @@
  #define DEBUG_FLAG EMPATHY_DEBUG_CHAT
  #include <libempathy/empathy-debug.h>
@@ -113,7 +109,7 @@
  	GtkTargetList *contact_targets;
  	GtkTargetList *file_targets;
  
-@@ -1308,8 +1315,19 @@
+@@ -1329,8 +1336,19 @@
  			sender, body);
  		g_signal_connect (indicator, "activate",
  				  G_CALLBACK (chat_window_indicator_activate_cb), chat);
@@ -134,7 +130,7 @@
  	}
  	empathy_indicator_show (indicator);
  }
-@@ -1326,6 +1344,25 @@
+@@ -1347,6 +1365,25 @@
  		DEBUG ("indicator is %p", indicator);
  		empathy_indicator_hide (indicator);
  		g_hash_table_remove (priv->indicators, chat);
@@ -160,7 +156,7 @@
  	} else {
  		DEBUG ("indicator is NULL, nothing to remove");
  	}
-@@ -1959,6 +1996,11 @@
+@@ -1980,6 +2017,11 @@
  		priv->chat_manager = NULL;
  	}
  
@@ -172,7 +168,7 @@
  	chat_windows = g_list_remove (chat_windows, window);
  	gtk_widget_destroy (priv->dialog);
  
-@@ -2057,6 +2099,9 @@
+@@ -2078,6 +2120,9 @@
  	priv->indicators = g_hash_table_new_full (g_direct_hash, g_direct_equal,
  			      NULL, g_object_unref);
  #endif
@@ -182,10 +178,8 @@
  
  	priv->notebook = gtk_notebook_new ();
  	gtk_notebook_set_group (GTK_NOTEBOOK (priv->notebook), "EmpathyChatWindow");
-
-=== modified file 'src/empathy-indicator-manager.c'
---- old/src/empathy-indicator-manager.c	2011-02-24 17:06:45 +0000
-+++ new/src/empathy-indicator-manager.c	2011-02-24 17:09:26 +0000
+--- a/src/empathy-indicator-manager.c
++++ b/src/empathy-indicator-manager.c
 @@ -45,6 +45,10 @@
  #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
  #include <libempathy/empathy-debug.h>
@@ -207,7 +201,7 @@
  } EmpathyIndicatorManagerPriv;
  
  typedef struct {
-@@ -172,6 +179,20 @@
+@@ -174,6 +181,20 @@
    g_object_unref (indicator);
    priv->indicator_events = g_slist_prepend (priv->indicator_events,
        indicator_event);
@@ -228,7 +222,7 @@
  }
  
  static void
-@@ -195,6 +216,26 @@
+@@ -197,6 +218,26 @@
        priv->indicator_events = g_slist_remove (priv->indicator_events,
            indicator_event);
        empathy_indicator_hide (indicator_event->indicator);
@@ -255,7 +249,7 @@
        return;
      }
    }
-@@ -211,6 +252,8 @@
+@@ -213,6 +254,8 @@
  
    priv = GET_PRIV (manager);
  
@@ -264,7 +258,7 @@
    for (l = priv->indicator_events; l; l = l->next)
    {
      IndicatorEvent *indicator_event;
-@@ -305,6 +348,10 @@
+@@ -307,6 +350,10 @@
      g_object_unref (priv->indicate_server);
      priv->indicate_server = NULL;
    }
@@ -275,7 +269,7 @@
    if (priv->login_timeouts) {
      g_hash_table_unref (priv->login_timeouts);
      priv->login_timeouts = NULL;
-@@ -379,6 +426,10 @@
+@@ -381,6 +428,10 @@
        G_CALLBACK (indicate_server_activate),
        manager);
  
@@ -286,4 +280,3 @@
    g_signal_connect (priv->event_manager, "event-added",
        G_CALLBACK (indicator_manager_event_added_cb),
        manager);
-
diff --git a/debian/patches/42_dont_change_menu_on_focus.patch b/debian/patches/42_dont_change_menu_on_focus.patch
deleted file mode 100644
index b92edc151..000000000
--- a/debian/patches/42_dont_change_menu_on_focus.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-Index: empathy-2.33.3/src/empathy-chat-window.c
-===================================================================
---- empathy-2.33.3.orig/src/empathy-chat-window.c	2011-03-15 16:04:12.372818869 -0400
-+++ empathy-2.33.3/src/empathy-chat-window.c	2011-03-15 16:08:00.452818868 -0400
-@@ -163,7 +163,7 @@
- 	{ "text/uri-list", 0, DND_DRAG_TYPE_URI_LIST },
- };
- 
--static void chat_window_update (EmpathyChatWindow *window);
-+static void chat_window_update (EmpathyChatWindow *window, gboolean via_focus_in);
- 
- G_DEFINE_TYPE (EmpathyChatWindow, empathy_chat_window, G_TYPE_OBJECT);
- 
-@@ -354,7 +354,7 @@
- 	g_signal_handlers_disconnect_by_func (object,
- 					      _submenu_notify_visible_changed_cb,
- 					      userdata);
--	chat_window_update (EMPATHY_CHAT_WINDOW (userdata));
-+	chat_window_update (EMPATHY_CHAT_WINDOW (userdata), FALSE);
- }
- 
- static void
-@@ -587,7 +587,8 @@
- }
- 
- static void
--chat_window_update (EmpathyChatWindow *window)
-+chat_window_update (EmpathyChatWindow *window,
-+		    gboolean via_focus_in)
- {
- 	EmpathyChatWindowPriv *priv = GET_PRIV (window);
- 	gint                   num_pages;
-@@ -600,8 +601,12 @@
- 
- 	chat_window_conversation_menu_update (priv, window);
- 
--	chat_window_contact_menu_update (priv,
--					 window);
-+	/* We know menu will be same as when we left it and we may confuse
-+	   any global menu watching. */
-+	if (!via_focus_in) {
-+		chat_window_contact_menu_update (priv,
-+						 window);
-+	}
- 
- 	chat_window_title_update (priv);
- 
-@@ -629,7 +634,8 @@
- }
- 
- static void
--chat_window_update_chat_tab (EmpathyChat *chat)
-+chat_window_update_chat_tab_full (EmpathyChat *chat,
-+				  gboolean via_focus_in)
- {
- 	EmpathyChatWindow     *window;
- 	EmpathyChatWindowPriv *priv;
-@@ -733,11 +739,17 @@
- 
- 	/* Update the window if it's the current chat */
- 	if (priv->current_chat == chat) {
--		chat_window_update (window);
-+		chat_window_update (window, via_focus_in);
- 	}
- }
- 
- static void
-+chat_window_update_chat_tab (EmpathyChat *chat)
-+{
-+	chat_window_update_chat_tab_full (chat, FALSE);
-+}
-+
-+static void
- chat_window_chat_notify_cb (EmpathyChat *chat)
- {
- 	EmpathyContact *old_remote_contact;
-@@ -1719,7 +1731,7 @@
- 	if (priv->chats == NULL) {
- 		g_object_unref (window);
- 	} else {
--		chat_window_update (window);
-+		chat_window_update (window, FALSE);
- 	}
- }
- 
-@@ -1738,7 +1750,7 @@
- 	chat_window_set_urgency_hint (window, FALSE);
- 
- 	/* Update the title, since we now mark all unread messages as read. */
--	chat_window_update_chat_tab (priv->current_chat);
-+	chat_window_update_chat_tab_full (priv->current_chat, TRUE);
- 
- #ifdef HAVE_LIBINDICATE
- 	/* Remove the indicator for the active chat */
diff --git a/debian/patches/series b/debian/patches/series
index 6b9a191c3..3670f45d4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,4 +12,3 @@
 38_lp_569289.patch
 40_unity_launcher_count.patch
 41_unity_launcher_progress.patch
-42_dont_change_menu_on_focus.patch