← Back to branch summary

~ubuntu-branches/ubuntu/trusty/ekiga/trusty

« back to all changes in this revision

Viewing changes to win32/diff/ekiga_sticonmenu3.patch

  • Committer: Package Import Robot
  • Author(s): Eugen Dedu, Eugen Dedu, Kilian Krause, Jordi Mallach
  • Date: 2012-10-16 14:47:35 UTC
  • mfrom: (5.1.6)
  • Revision ID: package-import@ubuntu.com-20121016144735-qb93utz05m94nfqp
Tags: 3.9.90-1
http://bugs.debian.org/679255
http://bugs.debian.org/520830
http://bugs.debian.org/670405
http://bugs.debian.org/551844
[ Eugen Dedu ]
* New upstream release (Closes: #679255, #520830, #670405, #551844,
  #617528, #684999, #538738, #530254, #378846, #582157, #545693,
  #689413, #545693)
* Enable support for experimental Jabber/XMPP protocol
* Remove libx264-dev, libavcodec-dev from Build-Deps as they are for
  OPAL library
* Remove fix-linux-gnueabihf-build.patch, unneeded anymore
* Remove unnecessary libsigc++ Build-Dep

[ Kilian Krause ]
* Bump debhelper compat to 9 to use multiarch for dh_auto_configure. Adjust
  build-depends on debhelper to >= 8.1.3
* debian/rules: make clean target somewhat more ignorant on missing
  build-deps
* Add libx264-dev, libavcodec-dev and libloudmouth1-dev to Build-Deps as
  OPAL has now support for H.263+ and H.264

[ Jordi Mallach ]
* Watch for .xz tarballs, and don't uupdate.
* Merge and acknowledge Héctor Orón's 3.2.7-4.1 NMU in unstable, thanks!
* Refresh fix-linux-gnueabihf-build.patch.
* Update Vcs-Svn URL.
* Drop debian/patches/configure.ac_languages_fix.patch, fixed upstream.
* Drop support for dh-autoreconf, as it's not needed anymore.

Show diffs side-by-side

added added

removed removed

Lines of Context:
win32/diff/ekiga_sticonmenu3.patch
1
 
# see http://www.mail-archive.com/ekiga-devel-list@gnome.org/msg03181.html
2
 
# written by Michael Rickmann
3
 
 
4
 
diff -ur ekiga.orig/src/gui/statusicon.cpp ekiga/src/gui/statusicon.cpp
5
 
--- ekiga.orig/src/gui/statusicon.cpp   2009-09-22 17:15:05.000000000 +0200
6
 
+++ ekiga/src/gui/statusicon.cpp        2009-09-22 17:16:17.000000000 +0200
7
 
@@ -296,11 +296,14 @@
8
 
       gtk_widget_show (window);
9
 
     }
10
 
     else {
11
 
-
12
 
+#ifndef WIN32
13
 
       if (gtk_window_has_toplevel_focus (GTK_WINDOW (window)))
14
 
+#endif
15
 
         gtk_widget_hide (window);
16
 
+#ifndef WIN32
17
 
       else
18
 
         gtk_window_present (GTK_WINDOW (window));
19
 
+#endif
20
 
     }
21
 
   }
22
 
   else {