[ekiga] [Windows] Refresh ekiga patches
- From: Eugen Dedu <ededu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ekiga] [Windows] Refresh ekiga patches
- Date: Wed, 6 Jun 2012 12:14:27 +0000 (UTC)
commit 4d5630b4f6d80aba850202e208df58b0b3f8a33d
Author: Eugen Dedu <Eugen Dedu pu-pm univ-fcomte fr>
Date: Wed Jun 6 14:14:02 2012 +0200
[Windows] Refresh ekiga patches
win32/diff/ekiga_sticonmenu1.patch | 10 +++++-----
win32/diff/ekiga_sticonmenu2.patch | 12 ++++++------
win32/diff/ekiga_sticonmenu3.patch | 22 ----------------------
3 files changed, 11 insertions(+), 33 deletions(-)
---
diff --git a/win32/diff/ekiga_sticonmenu1.patch b/win32/diff/ekiga_sticonmenu1.patch
index f9defcb..82869a0 100644
--- a/win32/diff/ekiga_sticonmenu1.patch
+++ b/win32/diff/ekiga_sticonmenu1.patch
@@ -3,13 +3,13 @@
# it is not integrated in ekiga because this bug will probably be fixed
# by future GTK+ releases
-diff -ur ekiga.orig/src/gui/statusicon.cpp ekiga/src/gui/statusicon.cpp
---- ekiga.orig/src/gui/statusicon.cpp 2009-08-31 14:04:57.000000000 +0200
-+++ ekiga/src/gui/statusicon.cpp 2009-08-31 14:05:17.000000000 +0200
-@@ -246,7 +246,11 @@
+diff -ur ekiga.orig/lib/engine/gui/gtk-frontend/statusicon.cpp ekiga/lib/engine/gui/gtk-frontend/statusicon.cpp
+--- ekiga.orig/lib/engine/gui/gtk-frontend/statusicon.cpp 2009-08-31 14:04:57.000000000 +0200
++++ ekiga/lib/engine/gui/gtk-frontend/statusicon.cpp 2009-08-31 14:05:17.000000000 +0200
+@@ -257,7 +257,11 @@
gtk_menu_popup (GTK_MENU (popup),
- NULL, NULL,
+ NULL, NULL,
+#ifdef WIN32
+ NULL, NULL,
+#else
diff --git a/win32/diff/ekiga_sticonmenu2.patch b/win32/diff/ekiga_sticonmenu2.patch
index 2b79c8e..d7bead8 100644
--- a/win32/diff/ekiga_sticonmenu2.patch
+++ b/win32/diff/ekiga_sticonmenu2.patch
@@ -1,7 +1,7 @@
-diff -ur ekiga.orig/src/gui/statusicon.cpp ekiga/src/gui/statusicon.cpp
---- ekiga.orig/src/gui/statusicon.cpp 2009-09-22 15:39:44.000000000 +0200
-+++ ekiga/src/gui/statusicon.cpp 2009-09-22 15:50:16.000000000 +0200
-@@ -92,6 +92,13 @@
+diff -ur ekiga.orig/lib/engine/gui/gtk-frontend/statusicon.cpp ekiga/lib/engine/gui/gtk-frontend/statusicon.cpp
+--- ekiga.orig/lib/engine/gui/gtk-frontend/statusicon.cpp 2009-09-22 15:39:44.000000000 +0200
++++ ekiga/lib/engine/gui/gtk-frontend/statusicon.cpp 2009-09-22 15:50:16.000000000 +0200
+@@ -93,6 +93,13 @@
guint activate_time,
gpointer data);
@@ -15,7 +15,7 @@ diff -ur ekiga.orig/src/gui/statusicon.cpp ekiga/src/gui/statusicon.cpp
static void
statusicon_activated_cb (GtkStatusIcon *icon,
gpointer data);
-@@ -254,6 +261,22 @@
+@@ -261,6 +268,22 @@
button, activate_time);
}
@@ -38,7 +38,7 @@ diff -ur ekiga.orig/src/gui/statusicon.cpp ekiga/src/gui/statusicon.cpp
static void
statusicon_activated_cb (G_GNUC_UNUSED GtkStatusIcon *icon,
-@@ -567,6 +590,11 @@
+@@ -561,6 +584,11 @@
g_signal_connect (self, "popup-menu",
G_CALLBACK (show_popup_menu_cb), self->priv->popup_menu);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]