From: Dan Breslau <dbreslau@painless-security.com>
Date: Tue, 5 Apr 2016 02:31:35 +0000 (-0400)
Subject: Fixed merge error
X-Git-Tag: v0.9.6~25
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=moonshot-ui.git;a=commitdiff_plain;h=cc43748edef21f411662c355518120d0b0677567

Fixed merge error
---

diff --git a/src/moonshot-identity-management-view.vala b/src/moonshot-identity-management-view.vala
index caee78e..4c343a9 100644
--- a/src/moonshot-identity-management-view.vala
+++ b/src/moonshot-identity-management-view.vala
@@ -533,21 +533,6 @@ public class IdentityManagerView : Window {
         present();
     }
 
-
-    /** Makes the window visible, or at least, notifies the user that the window
-      * wants to be visible.
-      *
-      * This differs from show() in that show() does not guarantee that the 
-      * window will be moved to the foreground. Actually, neither does this
-      * method, because the user's settings and window manager may affect the
-      * behavior significantly.
-      */
-    public void make_visible()
-    {
-        set_urgency_hint(true);
-        present();
-    }
-
     public IdCard check_add_password(IdCard identity, IdentityRequest request, IdentityManagerModel model)
     {
         IdCard retval = identity;