Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (f9f539fd9cb5af616d4ce3368e23cc1f7d502162)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (f9f539fd9cb5af616d4ce3368e23cc1f7d502162)
  • Date: Tue, 12 May 2020 04:15:25 +0000

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

mail/sylpheed/DETAILS | 1
mail/sylpheed/HISTORY | 5 ++++
mail/sylpheed/PRE_BUILD | 2 +
mail/sylpheed/sylpheed-trayicon.patch | 41
++++++++++++++++++++++++++++++++++
4 files changed, 49 insertions(+)

New commits:
commit f9f539fd9cb5af616d4ce3368e23cc1f7d502162
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

sylpheed: fix desktop warping

diff --git a/mail/sylpheed/DETAILS b/mail/sylpheed/DETAILS
index abe7ac3..59ea10a 100755
--- a/mail/sylpheed/DETAILS
+++ b/mail/sylpheed/DETAILS
@@ -5,6 +5,7 @@ if [[ $SYLPHEED_GTK2 == n ]]; then
else
VERSION=3.7.0
SECURITY_PATCH=1
+ PATCHLEVEL=1
if [[ $SYLPHEED_IT == y ]]; then
SOURCE3=Sylpheed3.0_icon-set.tar.gz
SOURCE3_URL[0]=http://www.coonsden.com/dl0ads/$SOURCE3
diff --git a/mail/sylpheed/HISTORY b/mail/sylpheed/HISTORY
index f9e9481..5fb54d8 100644
--- a/mail/sylpheed/HISTORY
+++ b/mail/sylpheed/HISTORY
@@ -1,3 +1,8 @@
+2020-05-11 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * PRE_BUILD: apply patch
+ * sylpheed-trayicon.patch: added, to fix desktop warping
+
2018-02-01 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 3.7.0

diff --git a/mail/sylpheed/PRE_BUILD b/mail/sylpheed/PRE_BUILD
index 6868556..14f155b 100755
--- a/mail/sylpheed/PRE_BUILD
+++ b/mail/sylpheed/PRE_BUILD
@@ -1,6 +1,8 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

+patch -p1 < "${SPELL_DIRECTORY}/sylpheed-trayicon.patch" &&
+
if [[ $SYLPHEED_IT == y ]]; then
unpack_file 3 &&
cp -av "$SOURCE3_DIRECTORY/src" "$SOURCE_DIRECTORY"
diff --git a/mail/sylpheed/sylpheed-trayicon.patch
b/mail/sylpheed/sylpheed-trayicon.patch
new file mode 100644
index 0000000..0035f40
--- /dev/null
+++ b/mail/sylpheed/sylpheed-trayicon.patch
@@ -0,0 +1,41 @@
+Subject: [PATCH] trayicon: fix main window restoration on different desktop
+
+with the previous code, the main window could only be restored on
+the desktop where it was minimized, which made the systray feature
+almost useless.
+now it behaves exactly like xchat2, from which the method has been
+borrowed.
+attempts to move the code into main_window_popup() failed.
+
+diff --git a/src/trayicon.c b/src/trayicon.c
+index ef56dc1..3020fe0 100644
+--- a/src/trayicon.c
++++ b/src/trayicon.c
+@@ -251,11 +251,20 @@ static void trayicon_activated(GtkStatusIcon
*status_icon, gpointer data)
+ else
+ main_window_popup(mainwin);
+ #else
++ static GdkScreen *screen;
++ static int x, y;
++
+ if (prefs_common.toggle_window_on_trayicon_click &&
+- gtk_window_is_active(GTK_WINDOW(mainwin->window)))
+- gtk_window_iconify(GTK_WINDOW(mainwin->window));
+- else
+- main_window_popup(mainwin);
++ gtk_widget_get_visible (GTK_WIDGET (mainwin->window))) {
++ gtk_window_get_position (GTK_WINDOW(mainwin->window), &x, &y);
++ screen = gtk_window_get_screen(GTK_WINDOW(mainwin->window));
++ gtk_widget_hide (GTK_WIDGET (mainwin->window));
++ } else {
++ gtk_window_set_screen (GTK_WINDOW(mainwin->window), screen);
++ gtk_window_move (GTK_WINDOW(mainwin->window), x, y);
++ gtk_widget_show (GTK_WIDGET (mainwin->window));
++ gtk_window_present (GTK_WINDOW(mainwin->window));
++ }
+ #endif
+ }
+
+--
+2.20.1
+



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (f9f539fd9cb5af616d4ce3368e23cc1f7d502162), Vlad Glagolev, 05/12/2020

Archive powered by MHonArc 2.6.24.

Top of Page