summaryrefslogtreecommitdiff
path: root/debian/patches/01_lpi.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches/01_lpi.patch')
-rw-r--r--debian/patches/01_lpi.patch35
1 files changed, 13 insertions, 22 deletions
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>
-