← Back to branch summary

~ubuntu-branches/ubuntu/utopic/parcellite/utopic

« back to all changes in this revision

Viewing changes to debian/patches/menu_popup_on_start.patch

  • Committer: Package Import Robot
  • Author(s): Andrew Starr-Bochicchio
  • Date: 2014-06-08 15:20:01 UTC
  • Revision ID: package-import@ubuntu.com-20140608152001-ogzb8yt9s11xozbj
Tags: 1.1.7-2
https://launchpad.net/bugs/1298580
Backport upstream commit to stop menu from popping
up on start up under Unity (LP: #1298580).

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/menu_popup_on_start.patch
 
1
Origin: upstream, http://sourceforge.net/p/parcellite/code/511/
 
2
Bug: http://sourceforge.net/p/parcellite/bugs/118/
 
3
Ubuntu-Bug: https://bugs.launchpad.net/ubuntu/+source/parcellite/+bug/1298580
 
4
 
 
5
Index: parcellite/src/main.c
 
6
===================================================================
 
7
--- parcellite.orig/src/main.c  2014-06-08 15:16:28.137300000 -0400
 
8
+++ parcellite/src/main.c       2014-06-08 15:16:45.774301000 -0400
 
9
@@ -2118,10 +2118,10 @@
 
10
        }
 
11
        
 
12
   g_timeout_add(CHECK_INTERVAL, check_clipboards_tic, NULL);  
 
13
-#ifdef HAVE_APPINDICATOR
 
14
-       check_for_appindictor(NULL);
 
15
-       if(!have_appindicator) /**maybe it slept in, check for it every 30 seconds.  */
 
16
-               g_timeout_add(CHECK_APPINDICATOR_INTERVAL, check_for_appindictor, NULL);  
 
17
+#ifdef HAVE_APPINDICATOR 
 
18
+       /* This closes bug 118, menu showing up at launch*/
 
19
+       g_timeout_add(500, check_for_appindictor, (void *)(1));
 
20
+       g_timeout_add(CHECK_APPINDICATOR_INTERVAL, check_for_appindictor, NULL);  
 
21
 #endif
 
22
   
 
23
   /* Bind global keys */