[arch-commits] Commit in lat/repos/community-any (6 files)

Balló György bgyorgy at archlinux.org
Sat Dec 29 21:50:04 UTC 2018


    Date: Saturday, December 29, 2018 @ 21:50:04
  Author: bgyorgy
Revision: 418934

archrelease: copy trunk to community-any

Added:
  lat/repos/community-any/PKGBUILD
    (from rev 418933, lat/trunk/PKGBUILD)
  lat/repos/community-any/drop-gconf.patch
    (from rev 418933, lat/trunk/drop-gconf.patch)
  lat/repos/community-any/drop-gnome-sharp.patch
    (from rev 418933, lat/trunk/drop-gnome-sharp.patch)
Deleted:
  lat/repos/community-any/PKGBUILD
  lat/repos/community-any/drop-gconf.patch
  lat/repos/community-any/drop-gnome-sharp.patch

------------------------+
 PKGBUILD               |   91 ++--
 drop-gconf.patch       |  980 +++++++++++++++++++++++------------------------
 drop-gnome-sharp.patch |  804 +++++++++++++++++++-------------------
 3 files changed, 939 insertions(+), 936 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-12-29 21:49:59 UTC (rev 418933)
+++ PKGBUILD	2018-12-29 21:50:04 UTC (rev 418934)
@@ -1,44 +0,0 @@
-# $Id$
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: William Rea <sillywilly at gmail.com>
-
-pkgname=lat
-pkgver=1.2.4
-pkgrel=4
-pkgdesc="LDAP administration tool"
-arch=('any')
-url="https://sourceforge.net/projects/ldap-at/"
-license=('GPL')
-depends=('gtk-sharp-2' 'libgnome-keyring')
-makedepends=('intltool' 'rarian')
-source=(https://downloads.sourceforge.net/ldap-at/$pkgname-$pkgver.tar.gz
-        drop-gnome-sharp.patch
-        drop-gconf.patch)
-sha256sums=('a37f3b5361956e5d664a0f8b767969d012acf67c5a4c99142edfa0d7c7a0890a'
-            '7b84b0d1f07a8951971c423549de88213885fef9af10d35151327fbafacf4ecd'
-            'bbe3eda800a3c7ff0710cd7934800cb65f76edfd3414639901fc39ef4a29ddc1')
-
-prepare() {
-  cd $pkgname-$pkgver
-  sed -i 's/gmcs/mcs/' configure{,.ac}
-
-  # Remove gnome-sharp dependency
-  patch -Np1 -i ../drop-gnome-sharp.patch
-
-  # Remove GConf dependency
-  patch -Np1 -i ../drop-gconf.patch
-
-  autoreconf -fi
-}
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}

Copied: lat/repos/community-any/PKGBUILD (from rev 418933, lat/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-12-29 21:50:04 UTC (rev 418934)
@@ -0,0 +1,47 @@
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: William Rea <sillywilly at gmail.com>
+
+pkgname=lat
+pkgver=1.2.4
+pkgrel=5
+pkgdesc="LDAP administration tool"
+arch=('any')
+url="https://sourceforge.net/projects/ldap-at/"
+license=('GPL')
+depends=('gtk-sharp-2' 'libgnome-keyring')
+makedepends=('intltool' 'rarian')
+source=(https://downloads.sourceforge.net/ldap-at/$pkgname-$pkgver.tar.gz
+        drop-gnome-sharp.patch
+        drop-gconf.patch)
+sha256sums=('a37f3b5361956e5d664a0f8b767969d012acf67c5a4c99142edfa0d7c7a0890a'
+            '7b84b0d1f07a8951971c423549de88213885fef9af10d35151327fbafacf4ecd'
+            'bbe3eda800a3c7ff0710cd7934800cb65f76edfd3414639901fc39ef4a29ddc1')
+
+prepare() {
+  cd $pkgname-$pkgver
+  sed -i 's/gmcs/mcs/' configure{,.ac}
+
+  # Remove gnome-sharp dependency
+  patch -Np1 -i ../drop-gnome-sharp.patch
+
+  # Remove GConf dependency
+  patch -Np1 -i ../drop-gconf.patch
+
+  autoreconf -fi
+}
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+
+  # Use standard icon instead of the very small included icon
+  sed -i 's/^Icon=.*/Icon=network-server/' "$pkgdir/usr/share/applications/lat.desktop"
+  rm -r "$pkgdir/usr/share/pixmaps/"
+}

Deleted: drop-gconf.patch
===================================================================
--- drop-gconf.patch	2018-12-29 21:49:59 UTC (rev 418933)
+++ drop-gconf.patch	2018-12-29 21:50:04 UTC (rev 418934)
@@ -1,490 +0,0 @@
-diff -Naur lat-1.2.4.orig/configure.ac lat-1.2.4/configure.ac
---- lat-1.2.4.orig/configure.ac	2012-11-18 10:48:06.000000000 +0100
-+++ lat-1.2.4/configure.ac	2018-09-03 00:58:14.508472772 +0200
-@@ -28,7 +28,6 @@
- 
- PKG_CHECK_MODULES(GTKSHARP,
- 		  gtk-sharp-2.0 >= $GTKSHARP_REQUIRED \
--		  gconf-sharp-2.0 >= $GTKSHARP_REQUIRED \
- 		  glade-sharp-2.0 >= $GTKSHARP_REQUIRED)
- 
- AC_SUBST(GTKSHARP_LIBS)
-diff -Naur lat-1.2.4.orig/lat/LdapTreeView.cs lat-1.2.4/lat/LdapTreeView.cs
---- lat-1.2.4.orig/lat/LdapTreeView.cs	2012-01-09 21:24:10.000000000 +0100
-+++ lat-1.2.4/lat/LdapTreeView.cs	2018-09-03 01:11:14.148828656 +0200
-@@ -73,8 +73,6 @@
- 		Gtk.ToolButton _newButton = null;
- 		Gtk.ToolButton _deleteButton = null;
- 
--		int browserSelectionMethod = 0;
--
- 		enum TreeCols { Icon, DN, RDN };
- 
- 		public event dnSelectedHandler dnSelected;
-@@ -143,7 +141,6 @@
- 			this.RowActivated += new RowActivatedHandler (OnRowActivated);
- 			this.RowCollapsed += new RowCollapsedHandler (ldapRowCollapsed);
- 			this.RowExpanded += new RowExpandedHandler (ldapRowExpanded);
--			this.Selection.Changed += OnSelectionChanged;
- 
- 			Gtk.Drag.DestSet (this, DestDefaults.All, _targetsTable,
- 					Gdk.DragAction.Copy);
-@@ -263,33 +260,8 @@
- 			return null;
- 		}
- 		
--		void OnSelectionChanged (object o, EventArgs args)
--		{
--			if (this.BrowserSelectionMethod == 2)
--				return;
--
--			Gtk.TreeIter iter;
--			Gtk.TreeModel model;
--			
--			if (this.Selection.GetSelected (out model, out iter))  {
--					
--				string dn = (string) model.GetValue (iter, (int)TreeCols.DN);				
--				string serverName = FindServerName (iter, model);
--				
--				if (dn.Equals (serverName)) {
--					DispatchDNSelectedEvent (dn, true, serverName);
--					return;
--				}
--
--				DispatchDNSelectedEvent (dn, false, serverName);
--			}
--		}
--
- 		void OnRowActivated (object o, RowActivatedArgs args)
- 		{
--			if (this.BrowserSelectionMethod == 1)
--				return;
--		
- 			TreePath path = args.Path;
- 			TreeIter iter;
- 			
-@@ -697,11 +669,5 @@
- 
- 			Log.Debug ("END OnDragDataReceived");
- 		}
--		
--		public int BrowserSelectionMethod
--		{
--			get { return browserSelectionMethod; }
--			set { browserSelectionMethod = value; }
--		}
- 	}
- }
-diff -Naur lat-1.2.4.orig/lat/Preferences.cs lat-1.2.4/lat/Preferences.cs
---- lat-1.2.4.orig/lat/Preferences.cs	2012-01-09 21:24:10.000000000 +0100
-+++ lat-1.2.4/lat/Preferences.cs	2018-09-03 00:55:27.105578468 +0200
-@@ -24,81 +24,6 @@
- 
- namespace lat
- {
--	public class Preferences
--	{
--		public const string MAIN_WINDOW_MAXIMIZED = "/apps/lat/ui/maximized";
--
--		public const string MAIN_WINDOW_X = "/apps/lat/ui/main_window_x";
--		public const string MAIN_WINDOW_Y = "/apps/lat/ui/main_window_y";
--		public const string MAIN_WINDOW_WIDTH = "/apps/lat/ui/main_window_width";
--		public const string MAIN_WINDOW_HEIGHT = "/apps/lat/ui/main_window_height";
--		public const string MAIN_WINDOW_HPANED = "/apps/lat/ui/main_window_hpaned";
--
--		public const string BROWSER_SELECTION = "/apps/lat/ui/browser_selection";
--
--		static GConf.Client client;
--		static GConf.NotifyEventHandler changed_handler;
--
--		public static GConf.Client Client 
--		{
--			get {
--				if (client == null) {
--					client = new GConf.Client ();
--
--					changed_handler = new GConf.NotifyEventHandler (OnSettingChanged);
--					client.AddNotify ("/apps/lat", changed_handler);
--				}
--				return client;
--			}
--		}
--
--		public static object GetDefault (string key)
--		{
--			switch (key) 
--			{
--				case MAIN_WINDOW_X:
--				case MAIN_WINDOW_Y:
--				case MAIN_WINDOW_HEIGHT:
--				case MAIN_WINDOW_WIDTH:
--				case MAIN_WINDOW_HPANED:
--					return null;
--					
--				case BROWSER_SELECTION:
--					return 2;
--			}
--
--			return null;
--		}
--
--		public static object Get (string key)
--		{
--			try {
--				return Client.Get (key);
--			} catch (GConf.NoSuchKeyException) {
--				object default_val = GetDefault (key);
--
--				if (default_val != null)
--					Client.Set (key, default_val);
--
--				return default_val;
--			}
--		}
--
--		public static void Set (string key, object value)
--		{
--			Client.Set (key, value);
--		}
--
--		public static event GConf.NotifyEventHandler SettingChanged;
--
--		static void OnSettingChanged (object sender, GConf.NotifyEventArgs args)
--		{
--			if (SettingChanged != null) {
--				SettingChanged (sender, args);
--			}
--		}
--	}
--	
- 	public class PreferencesDialog
- 	{
- 		Glade.XML ui;
-@@ -129,8 +54,6 @@
- 
- 			UpdateProfileList ();
- 					
--			LoadPreference (Preferences.BROWSER_SELECTION);
--					
- 			preferencesDialog.Icon = Global.latIcon;
- 			preferencesDialog.Resize (300, 400);			
- 			preferencesDialog.Run ();
-@@ -151,26 +74,6 @@
- 				profileStore.AppendValues (s);
- 		}
- 
--		void LoadPreference (String key)
--		{
--			object val = Preferences.Get (key);
--
--			if (val == null)
--				return;
--			
--			switch (key) {
--				
--			case Preferences.BROWSER_SELECTION:
--				int b = (int) val;
--				if (b == 1)
--					browserSingleClickButton.Active = true;
--				else if (b == 2)
--					browserDoubleClickButton.Active = true;
--					
--				break;
--			}
--		}
--
- 		string GetSelectedProfileName ()
- 		{
- 			TreeIter iter;
-@@ -225,14 +128,6 @@
- 			}
- 		}
- 				
--		public void OnDoubleClickToggled (object o, EventArgs args)
--		{
--			if (browserSingleClickButton.Active)
--				Preferences.Set (Preferences.BROWSER_SELECTION, 1);
--			else
--				Preferences.Set (Preferences.BROWSER_SELECTION, 2);
--		}
--		
- 		public void OnHelpClicked (object o, EventArgs args)
- 		{
- 			try {
-diff -Naur lat-1.2.4.orig/lat/SelectContainerDialog.cs lat-1.2.4/lat/SelectContainerDialog.cs
---- lat-1.2.4.orig/lat/SelectContainerDialog.cs	2012-01-09 21:24:10.000000000 +0100
-+++ lat-1.2.4/lat/SelectContainerDialog.cs	2018-09-03 00:55:58.322770395 +0200
-@@ -41,7 +41,6 @@
- 
- 			_ldapTreeview = new LdapTreeView (parent, connection);
- 			_ldapTreeview.dnSelected += new dnSelectedHandler (ldapDNSelected);
--			_ldapTreeview.BrowserSelectionMethod = (int)Preferences.Get (Preferences.BROWSER_SELECTION);
- 
- 			browserScrolledWindow.AddWithViewport (_ldapTreeview);
- 			browserScrolledWindow.Show ();
-diff -Naur lat-1.2.4.orig/lat/Window.cs lat-1.2.4/lat/Window.cs
---- lat-1.2.4.orig/lat/Window.cs	2012-04-10 13:50:08.000000000 +0200
-+++ lat-1.2.4/lat/Window.cs	2018-09-03 00:53:03.583268121 +0200
-@@ -133,15 +133,6 @@
- 			Gdk.Pixbuf dirIcon = Gdk.Pixbuf.LoadFromResource ("x-directory-remote-server.png");
- 			mainWindow.Icon = dirIcon;
- 			
--			// Restore window positions
--			LoadPreference (Preferences.MAIN_WINDOW_WIDTH);
--			LoadPreference (Preferences.MAIN_WINDOW_X);
--			LoadPreference (Preferences.MAIN_WINDOW_MAXIMIZED);
--			LoadPreference (Preferences.MAIN_WINDOW_HPANED);
--
--			// Watch for any changes
--			Preferences.SettingChanged += OnPreferencesChanged;
--
- 			// Setup views
- 			viewsTreeView = new ViewsTreeView ();
- 			viewsTreeView.ViewSelected += new ViewSelectedHandler (OnViewSelected);
-@@ -154,8 +145,6 @@
- 			browserScrolledWindow.AddWithViewport (ldapTreeView);
- 			browserScrolledWindow.Show ();
- 
--			LoadPreference (Preferences.BROWSER_SELECTION);
--
- 			// Setup schema browser
- 			schemaTreeview = new SchemaTreeView (mainWindow);
- 			schemaTreeview.schemaSelected += new schemaSelectedHandler (OnSchemaDNSelected);
-@@ -278,52 +267,6 @@
- 			return conn;
- 		}
- 
--		void LoadPreference (String key)
--		{
--			object val = Preferences.Get (key);
--
--			if (val == null) {
--
--				if (key == Preferences.MAIN_WINDOW_HPANED)
--					hpaned1.Position = 250;
--
--				return;
--			}
--			
--			Log.Debug ("Setting {0} to {1}", key, val);
--
--			switch (key) {
--			case Preferences.MAIN_WINDOW_MAXIMIZED:
--				if ((bool) val)
--					mainWindow.Maximize ();
--				else
--					mainWindow.Unmaximize ();
--				break;
--
--			case Preferences.MAIN_WINDOW_X:
--			case Preferences.MAIN_WINDOW_Y:
--				mainWindow.Move((int) Preferences.Get(Preferences.MAIN_WINDOW_X),
--						(int) Preferences.Get(Preferences.MAIN_WINDOW_Y));
--				break;
--			
--			case Preferences.MAIN_WINDOW_WIDTH:
--			case Preferences.MAIN_WINDOW_HEIGHT:
--				mainWindow.SetDefaultSize((int) Preferences.Get(Preferences.MAIN_WINDOW_WIDTH),
--						(int) Preferences.Get(Preferences.MAIN_WINDOW_HEIGHT));
--
--				mainWindow.ReshowWithInitialSize();
--				break;
--
--			case Preferences.MAIN_WINDOW_HPANED:
--				hpaned1.Position = (int) Preferences.Get (Preferences.MAIN_WINDOW_HPANED);
--				break;
--				
--			case Preferences.BROWSER_SELECTION:
--				ldapTreeView.BrowserSelectionMethod = (int) val; 
--				break;				
--			}
--		}
--
- 		void SetBrowserTooltips ()
- 		{
- 			newMenuToolButton.TooltipText = "Create a new directory entry";
-@@ -880,23 +823,6 @@
- 
- 		void Close ()
- 		{
--			int x, y, width, height;
--			mainWindow.GetPosition (out x, out y);
--			mainWindow.GetSize (out width, out height);
--
--			bool maximized = ((mainWindow.GdkWindow.State & Gdk.WindowState.Maximized) > 0);
--			Preferences.Set (Preferences.MAIN_WINDOW_MAXIMIZED, maximized);
--
--			if (!maximized) {
--				Preferences.Set (Preferences.MAIN_WINDOW_X, x);
--				Preferences.Set (Preferences.MAIN_WINDOW_Y, y);
--				Preferences.Set (Preferences.MAIN_WINDOW_WIDTH, width);
--				Preferences.Set (Preferences.MAIN_WINDOW_HEIGHT, height);
--			}
--
--			Preferences.Set (Preferences.MAIN_WINDOW_HPANED, hpaned1.Position);
--			Preferences.Set (Preferences.BROWSER_SELECTION, ldapTreeView.BrowserSelectionMethod);
--
- #if ENABLE_AVAHI
- 			finder.Stop ();
- #endif
-@@ -1254,11 +1180,6 @@
- 			viewDataTreeView.ShowNewItemDialog (l.Text);
- 		}
- 
--		public void OnPreferencesChanged (object sender, GConf.NotifyEventArgs args)
--		{
--			LoadPreference (args.Key);
--		}
--
- 		void OnSchemaDNSelected (object o, schemaSelectedEventArgs args)
- 		{
- 			if (args.Name == "Object Classes" || args.Name == "Attribute Types" || args.Name == "Matching Rules" || args.Name == "LDAP Syntaxes")
-diff -Naur lat-1.2.4.orig/resources/lat.glade lat-1.2.4/resources/lat.glade
---- lat-1.2.4.orig/resources/lat.glade	2012-04-10 13:54:27.000000000 +0200
-+++ lat-1.2.4/resources/lat.glade	2018-09-03 01:00:10.597241955 +0200
-@@ -10426,145 +10426,6 @@
- 	      <property name="enable_popup">False</property>
- 
- 	      <child>
--		<widget class="GtkVBox" id="vbox136">
--		  <property name="visible">True</property>
--		  <property name="homogeneous">False</property>
--		  <property name="spacing">0</property>
--
--		  <child>
--		    <widget class="GtkHBox" id="hbox431">
--		      <property name="visible">True</property>
--		      <property name="homogeneous">False</property>
--		      <property name="spacing">0</property>
--
--		      <child>
--			<widget class="GtkLabel" id="label431">
--			  <property name="visible">True</property>
--			  <property name="label" translatable="yes"><b>Browser selection</b></property>
--			  <property name="use_underline">False</property>
--			  <property name="use_markup">True</property>
--			  <property name="justify">GTK_JUSTIFY_LEFT</property>
--			  <property name="wrap">False</property>
--			  <property name="selectable">False</property>
--			  <property name="xalign">0.5</property>
--			  <property name="yalign">0.5</property>
--			  <property name="xpad">0</property>
--			  <property name="ypad">0</property>
--			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--			  <property name="width_chars">-1</property>
--			  <property name="single_line_mode">False</property>
--			  <property name="angle">0</property>
--			</widget>
--			<packing>
--			  <property name="padding">10</property>
--			  <property name="expand">False</property>
--			  <property name="fill">False</property>
--			</packing>
--		      </child>
--		    </widget>
--		    <packing>
--		      <property name="padding">10</property>
--		      <property name="expand">False</property>
--		      <property name="fill">False</property>
--		    </packing>
--		  </child>
--
--		  <child>
--		    <widget class="GtkHBox" id="hbox432">
--		      <property name="visible">True</property>
--		      <property name="homogeneous">False</property>
--		      <property name="spacing">0</property>
--
--		      <child>
--			<widget class="GtkRadioButton" id="browserSingleClickButton">
--			  <property name="visible">True</property>
--			  <property name="can_focus">True</property>
--			  <property name="label" translatable="yes">Single click</property>
--			  <property name="use_underline">True</property>
--			  <property name="relief">GTK_RELIEF_NORMAL</property>
--			  <property name="focus_on_click">True</property>
--			  <property name="active">False</property>
--			  <property name="inconsistent">False</property>
--			  <property name="draw_indicator">True</property>
--			</widget>
--			<packing>
--			  <property name="padding">20</property>
--			  <property name="expand">False</property>
--			  <property name="fill">False</property>
--			</packing>
--		      </child>
--		    </widget>
--		    <packing>
--		      <property name="padding">5</property>
--		      <property name="expand">False</property>
--		      <property name="fill">False</property>
--		    </packing>
--		  </child>
--
--		  <child>
--		    <widget class="GtkHBox" id="hbox433">
--		      <property name="visible">True</property>
--		      <property name="homogeneous">False</property>
--		      <property name="spacing">0</property>
--
--		      <child>
--			<widget class="GtkRadioButton" id="browserDoubleClickButton">
--			  <property name="visible">True</property>
--			  <property name="can_focus">True</property>
--			  <property name="label" translatable="yes">Double click</property>
--			  <property name="use_underline">True</property>
--			  <property name="relief">GTK_RELIEF_NORMAL</property>
--			  <property name="focus_on_click">True</property>
--			  <property name="active">True</property>
--			  <property name="inconsistent">False</property>
--			  <property name="draw_indicator">True</property>
--			  <property name="group">browserSingleClickButton</property>
--			  <signal name="toggled" handler="OnDoubleClickToggled" last_modification_time="Sun, 30 Apr 2006 13:27:08 GMT"/>
--			</widget>
--			<packing>
--			  <property name="padding">20</property>
--			  <property name="expand">False</property>
--			  <property name="fill">False</property>
--			</packing>
--		      </child>
--		    </widget>
--		    <packing>
--		      <property name="padding">0</property>
--		      <property name="expand">False</property>
--		      <property name="fill">False</property>
--		    </packing>
--		  </child>
--		</widget>
--		<packing>
--		  <property name="tab_expand">False</property>
--		  <property name="tab_fill">True</property>
--		</packing>
--	      </child>
--
--	      <child>
--		<widget class="GtkLabel" id="label429">
--		  <property name="visible">True</property>
--		  <property name="label" translatable="yes">General</property>
--		  <property name="use_underline">False</property>
--		  <property name="use_markup">False</property>
--		  <property name="justify">GTK_JUSTIFY_LEFT</property>
--		  <property name="wrap">False</property>
--		  <property name="selectable">False</property>
--		  <property name="xalign">0.5</property>
--		  <property name="yalign">0.5</property>
--		  <property name="xpad">0</property>
--		  <property name="ypad">0</property>
--		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--		  <property name="width_chars">-1</property>
--		  <property name="single_line_mode">False</property>
--		  <property name="angle">0</property>
--		</widget>
--		<packing>
--		  <property name="type">tab</property>
--		</packing>
--	      </child>
--
--	      <child>
- 		<widget class="GtkHBox" id="hbox450">
- 		  <property name="visible">True</property>
- 		  <property name="homogeneous">False</property>

Copied: lat/repos/community-any/drop-gconf.patch (from rev 418933, lat/trunk/drop-gconf.patch)
===================================================================
--- drop-gconf.patch	                        (rev 0)
+++ drop-gconf.patch	2018-12-29 21:50:04 UTC (rev 418934)
@@ -0,0 +1,490 @@
+diff -Naur lat-1.2.4.orig/configure.ac lat-1.2.4/configure.ac
+--- lat-1.2.4.orig/configure.ac	2012-11-18 10:48:06.000000000 +0100
++++ lat-1.2.4/configure.ac	2018-09-03 00:58:14.508472772 +0200
+@@ -28,7 +28,6 @@
+ 
+ PKG_CHECK_MODULES(GTKSHARP,
+ 		  gtk-sharp-2.0 >= $GTKSHARP_REQUIRED \
+-		  gconf-sharp-2.0 >= $GTKSHARP_REQUIRED \
+ 		  glade-sharp-2.0 >= $GTKSHARP_REQUIRED)
+ 
+ AC_SUBST(GTKSHARP_LIBS)
+diff -Naur lat-1.2.4.orig/lat/LdapTreeView.cs lat-1.2.4/lat/LdapTreeView.cs
+--- lat-1.2.4.orig/lat/LdapTreeView.cs	2012-01-09 21:24:10.000000000 +0100
++++ lat-1.2.4/lat/LdapTreeView.cs	2018-09-03 01:11:14.148828656 +0200
+@@ -73,8 +73,6 @@
+ 		Gtk.ToolButton _newButton = null;
+ 		Gtk.ToolButton _deleteButton = null;
+ 
+-		int browserSelectionMethod = 0;
+-
+ 		enum TreeCols { Icon, DN, RDN };
+ 
+ 		public event dnSelectedHandler dnSelected;
+@@ -143,7 +141,6 @@
+ 			this.RowActivated += new RowActivatedHandler (OnRowActivated);
+ 			this.RowCollapsed += new RowCollapsedHandler (ldapRowCollapsed);
+ 			this.RowExpanded += new RowExpandedHandler (ldapRowExpanded);
+-			this.Selection.Changed += OnSelectionChanged;
+ 
+ 			Gtk.Drag.DestSet (this, DestDefaults.All, _targetsTable,
+ 					Gdk.DragAction.Copy);
+@@ -263,33 +260,8 @@
+ 			return null;
+ 		}
+ 		
+-		void OnSelectionChanged (object o, EventArgs args)
+-		{
+-			if (this.BrowserSelectionMethod == 2)
+-				return;
+-
+-			Gtk.TreeIter iter;
+-			Gtk.TreeModel model;
+-			
+-			if (this.Selection.GetSelected (out model, out iter))  {
+-					
+-				string dn = (string) model.GetValue (iter, (int)TreeCols.DN);				
+-				string serverName = FindServerName (iter, model);
+-				
+-				if (dn.Equals (serverName)) {
+-					DispatchDNSelectedEvent (dn, true, serverName);
+-					return;
+-				}
+-
+-				DispatchDNSelectedEvent (dn, false, serverName);
+-			}
+-		}
+-
+ 		void OnRowActivated (object o, RowActivatedArgs args)
+ 		{
+-			if (this.BrowserSelectionMethod == 1)
+-				return;
+-		
+ 			TreePath path = args.Path;
+ 			TreeIter iter;
+ 			
+@@ -697,11 +669,5 @@
+ 
+ 			Log.Debug ("END OnDragDataReceived");
+ 		}
+-		
+-		public int BrowserSelectionMethod
+-		{
+-			get { return browserSelectionMethod; }
+-			set { browserSelectionMethod = value; }
+-		}
+ 	}
+ }
+diff -Naur lat-1.2.4.orig/lat/Preferences.cs lat-1.2.4/lat/Preferences.cs
+--- lat-1.2.4.orig/lat/Preferences.cs	2012-01-09 21:24:10.000000000 +0100
++++ lat-1.2.4/lat/Preferences.cs	2018-09-03 00:55:27.105578468 +0200
+@@ -24,81 +24,6 @@
+ 
+ namespace lat
+ {
+-	public class Preferences
+-	{
+-		public const string MAIN_WINDOW_MAXIMIZED = "/apps/lat/ui/maximized";
+-
+-		public const string MAIN_WINDOW_X = "/apps/lat/ui/main_window_x";
+-		public const string MAIN_WINDOW_Y = "/apps/lat/ui/main_window_y";
+-		public const string MAIN_WINDOW_WIDTH = "/apps/lat/ui/main_window_width";
+-		public const string MAIN_WINDOW_HEIGHT = "/apps/lat/ui/main_window_height";
+-		public const string MAIN_WINDOW_HPANED = "/apps/lat/ui/main_window_hpaned";
+-
+-		public const string BROWSER_SELECTION = "/apps/lat/ui/browser_selection";
+-
+-		static GConf.Client client;
+-		static GConf.NotifyEventHandler changed_handler;
+-
+-		public static GConf.Client Client 
+-		{
+-			get {
+-				if (client == null) {
+-					client = new GConf.Client ();
+-
+-					changed_handler = new GConf.NotifyEventHandler (OnSettingChanged);
+-					client.AddNotify ("/apps/lat", changed_handler);
+-				}
+-				return client;
+-			}
+-		}
+-
+-		public static object GetDefault (string key)
+-		{
+-			switch (key) 
+-			{
+-				case MAIN_WINDOW_X:
+-				case MAIN_WINDOW_Y:
+-				case MAIN_WINDOW_HEIGHT:
+-				case MAIN_WINDOW_WIDTH:
+-				case MAIN_WINDOW_HPANED:
+-					return null;
+-					
+-				case BROWSER_SELECTION:
+-					return 2;
+-			}
+-
+-			return null;
+-		}
+-
+-		public static object Get (string key)
+-		{
+-			try {
+-				return Client.Get (key);
+-			} catch (GConf.NoSuchKeyException) {
+-				object default_val = GetDefault (key);
+-
+-				if (default_val != null)
+-					Client.Set (key, default_val);
+-
+-				return default_val;
+-			}
+-		}
+-
+-		public static void Set (string key, object value)
+-		{
+-			Client.Set (key, value);
+-		}
+-
+-		public static event GConf.NotifyEventHandler SettingChanged;
+-
+-		static void OnSettingChanged (object sender, GConf.NotifyEventArgs args)
+-		{
+-			if (SettingChanged != null) {
+-				SettingChanged (sender, args);
+-			}
+-		}
+-	}
+-	
+ 	public class PreferencesDialog
+ 	{
+ 		Glade.XML ui;
+@@ -129,8 +54,6 @@
+ 
+ 			UpdateProfileList ();
+ 					
+-			LoadPreference (Preferences.BROWSER_SELECTION);
+-					
+ 			preferencesDialog.Icon = Global.latIcon;
+ 			preferencesDialog.Resize (300, 400);			
+ 			preferencesDialog.Run ();
+@@ -151,26 +74,6 @@
+ 				profileStore.AppendValues (s);
+ 		}
+ 
+-		void LoadPreference (String key)
+-		{
+-			object val = Preferences.Get (key);
+-
+-			if (val == null)
+-				return;
+-			
+-			switch (key) {
+-				
+-			case Preferences.BROWSER_SELECTION:
+-				int b = (int) val;
+-				if (b == 1)
+-					browserSingleClickButton.Active = true;
+-				else if (b == 2)
+-					browserDoubleClickButton.Active = true;
+-					
+-				break;
+-			}
+-		}
+-
+ 		string GetSelectedProfileName ()
+ 		{
+ 			TreeIter iter;
+@@ -225,14 +128,6 @@
+ 			}
+ 		}
+ 				
+-		public void OnDoubleClickToggled (object o, EventArgs args)
+-		{
+-			if (browserSingleClickButton.Active)
+-				Preferences.Set (Preferences.BROWSER_SELECTION, 1);
+-			else
+-				Preferences.Set (Preferences.BROWSER_SELECTION, 2);
+-		}
+-		
+ 		public void OnHelpClicked (object o, EventArgs args)
+ 		{
+ 			try {
+diff -Naur lat-1.2.4.orig/lat/SelectContainerDialog.cs lat-1.2.4/lat/SelectContainerDialog.cs
+--- lat-1.2.4.orig/lat/SelectContainerDialog.cs	2012-01-09 21:24:10.000000000 +0100
++++ lat-1.2.4/lat/SelectContainerDialog.cs	2018-09-03 00:55:58.322770395 +0200
+@@ -41,7 +41,6 @@
+ 
+ 			_ldapTreeview = new LdapTreeView (parent, connection);
+ 			_ldapTreeview.dnSelected += new dnSelectedHandler (ldapDNSelected);
+-			_ldapTreeview.BrowserSelectionMethod = (int)Preferences.Get (Preferences.BROWSER_SELECTION);
+ 
+ 			browserScrolledWindow.AddWithViewport (_ldapTreeview);
+ 			browserScrolledWindow.Show ();
+diff -Naur lat-1.2.4.orig/lat/Window.cs lat-1.2.4/lat/Window.cs
+--- lat-1.2.4.orig/lat/Window.cs	2012-04-10 13:50:08.000000000 +0200
++++ lat-1.2.4/lat/Window.cs	2018-09-03 00:53:03.583268121 +0200
+@@ -133,15 +133,6 @@
+ 			Gdk.Pixbuf dirIcon = Gdk.Pixbuf.LoadFromResource ("x-directory-remote-server.png");
+ 			mainWindow.Icon = dirIcon;
+ 			
+-			// Restore window positions
+-			LoadPreference (Preferences.MAIN_WINDOW_WIDTH);
+-			LoadPreference (Preferences.MAIN_WINDOW_X);
+-			LoadPreference (Preferences.MAIN_WINDOW_MAXIMIZED);
+-			LoadPreference (Preferences.MAIN_WINDOW_HPANED);
+-
+-			// Watch for any changes
+-			Preferences.SettingChanged += OnPreferencesChanged;
+-
+ 			// Setup views
+ 			viewsTreeView = new ViewsTreeView ();
+ 			viewsTreeView.ViewSelected += new ViewSelectedHandler (OnViewSelected);
+@@ -154,8 +145,6 @@
+ 			browserScrolledWindow.AddWithViewport (ldapTreeView);
+ 			browserScrolledWindow.Show ();
+ 
+-			LoadPreference (Preferences.BROWSER_SELECTION);
+-
+ 			// Setup schema browser
+ 			schemaTreeview = new SchemaTreeView (mainWindow);
+ 			schemaTreeview.schemaSelected += new schemaSelectedHandler (OnSchemaDNSelected);
+@@ -278,52 +267,6 @@
+ 			return conn;
+ 		}
+ 
+-		void LoadPreference (String key)
+-		{
+-			object val = Preferences.Get (key);
+-
+-			if (val == null) {
+-
+-				if (key == Preferences.MAIN_WINDOW_HPANED)
+-					hpaned1.Position = 250;
+-
+-				return;
+-			}
+-			
+-			Log.Debug ("Setting {0} to {1}", key, val);
+-
+-			switch (key) {
+-			case Preferences.MAIN_WINDOW_MAXIMIZED:
+-				if ((bool) val)
+-					mainWindow.Maximize ();
+-				else
+-					mainWindow.Unmaximize ();
+-				break;
+-
+-			case Preferences.MAIN_WINDOW_X:
+-			case Preferences.MAIN_WINDOW_Y:
+-				mainWindow.Move((int) Preferences.Get(Preferences.MAIN_WINDOW_X),
+-						(int) Preferences.Get(Preferences.MAIN_WINDOW_Y));
+-				break;
+-			
+-			case Preferences.MAIN_WINDOW_WIDTH:
+-			case Preferences.MAIN_WINDOW_HEIGHT:
+-				mainWindow.SetDefaultSize((int) Preferences.Get(Preferences.MAIN_WINDOW_WIDTH),
+-						(int) Preferences.Get(Preferences.MAIN_WINDOW_HEIGHT));
+-
+-				mainWindow.ReshowWithInitialSize();
+-				break;
+-
+-			case Preferences.MAIN_WINDOW_HPANED:
+-				hpaned1.Position = (int) Preferences.Get (Preferences.MAIN_WINDOW_HPANED);
+-				break;
+-				
+-			case Preferences.BROWSER_SELECTION:
+-				ldapTreeView.BrowserSelectionMethod = (int) val; 
+-				break;				
+-			}
+-		}
+-
+ 		void SetBrowserTooltips ()
+ 		{
+ 			newMenuToolButton.TooltipText = "Create a new directory entry";
+@@ -880,23 +823,6 @@
+ 
+ 		void Close ()
+ 		{
+-			int x, y, width, height;
+-			mainWindow.GetPosition (out x, out y);
+-			mainWindow.GetSize (out width, out height);
+-
+-			bool maximized = ((mainWindow.GdkWindow.State & Gdk.WindowState.Maximized) > 0);
+-			Preferences.Set (Preferences.MAIN_WINDOW_MAXIMIZED, maximized);
+-
+-			if (!maximized) {
+-				Preferences.Set (Preferences.MAIN_WINDOW_X, x);
+-				Preferences.Set (Preferences.MAIN_WINDOW_Y, y);
+-				Preferences.Set (Preferences.MAIN_WINDOW_WIDTH, width);
+-				Preferences.Set (Preferences.MAIN_WINDOW_HEIGHT, height);
+-			}
+-
+-			Preferences.Set (Preferences.MAIN_WINDOW_HPANED, hpaned1.Position);
+-			Preferences.Set (Preferences.BROWSER_SELECTION, ldapTreeView.BrowserSelectionMethod);
+-
+ #if ENABLE_AVAHI
+ 			finder.Stop ();
+ #endif
+@@ -1254,11 +1180,6 @@
+ 			viewDataTreeView.ShowNewItemDialog (l.Text);
+ 		}
+ 
+-		public void OnPreferencesChanged (object sender, GConf.NotifyEventArgs args)
+-		{
+-			LoadPreference (args.Key);
+-		}
+-
+ 		void OnSchemaDNSelected (object o, schemaSelectedEventArgs args)
+ 		{
+ 			if (args.Name == "Object Classes" || args.Name == "Attribute Types" || args.Name == "Matching Rules" || args.Name == "LDAP Syntaxes")
+diff -Naur lat-1.2.4.orig/resources/lat.glade lat-1.2.4/resources/lat.glade
+--- lat-1.2.4.orig/resources/lat.glade	2012-04-10 13:54:27.000000000 +0200
++++ lat-1.2.4/resources/lat.glade	2018-09-03 01:00:10.597241955 +0200
+@@ -10426,145 +10426,6 @@
+ 	      <property name="enable_popup">False</property>
+ 
+ 	      <child>
+-		<widget class="GtkVBox" id="vbox136">
+-		  <property name="visible">True</property>
+-		  <property name="homogeneous">False</property>
+-		  <property name="spacing">0</property>
+-
+-		  <child>
+-		    <widget class="GtkHBox" id="hbox431">
+-		      <property name="visible">True</property>
+-		      <property name="homogeneous">False</property>
+-		      <property name="spacing">0</property>
+-
+-		      <child>
+-			<widget class="GtkLabel" id="label431">
+-			  <property name="visible">True</property>
+-			  <property name="label" translatable="yes"><b>Browser selection</b></property>
+-			  <property name="use_underline">False</property>
+-			  <property name="use_markup">True</property>
+-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
+-			  <property name="wrap">False</property>
+-			  <property name="selectable">False</property>
+-			  <property name="xalign">0.5</property>
+-			  <property name="yalign">0.5</property>
+-			  <property name="xpad">0</property>
+-			  <property name="ypad">0</property>
+-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-			  <property name="width_chars">-1</property>
+-			  <property name="single_line_mode">False</property>
+-			  <property name="angle">0</property>
+-			</widget>
+-			<packing>
+-			  <property name="padding">10</property>
+-			  <property name="expand">False</property>
+-			  <property name="fill">False</property>
+-			</packing>
+-		      </child>
+-		    </widget>
+-		    <packing>
+-		      <property name="padding">10</property>
+-		      <property name="expand">False</property>
+-		      <property name="fill">False</property>
+-		    </packing>
+-		  </child>
+-
+-		  <child>
+-		    <widget class="GtkHBox" id="hbox432">
+-		      <property name="visible">True</property>
+-		      <property name="homogeneous">False</property>
+-		      <property name="spacing">0</property>
+-
+-		      <child>
+-			<widget class="GtkRadioButton" id="browserSingleClickButton">
+-			  <property name="visible">True</property>
+-			  <property name="can_focus">True</property>
+-			  <property name="label" translatable="yes">Single click</property>
+-			  <property name="use_underline">True</property>
+-			  <property name="relief">GTK_RELIEF_NORMAL</property>
+-			  <property name="focus_on_click">True</property>
+-			  <property name="active">False</property>
+-			  <property name="inconsistent">False</property>
+-			  <property name="draw_indicator">True</property>
+-			</widget>
+-			<packing>
+-			  <property name="padding">20</property>
+-			  <property name="expand">False</property>
+-			  <property name="fill">False</property>
+-			</packing>
+-		      </child>
+-		    </widget>
+-		    <packing>
+-		      <property name="padding">5</property>
+-		      <property name="expand">False</property>
+-		      <property name="fill">False</property>
+-		    </packing>
+-		  </child>
+-
+-		  <child>
+-		    <widget class="GtkHBox" id="hbox433">
+-		      <property name="visible">True</property>
+-		      <property name="homogeneous">False</property>
+-		      <property name="spacing">0</property>
+-
+-		      <child>
+-			<widget class="GtkRadioButton" id="browserDoubleClickButton">
+-			  <property name="visible">True</property>
+-			  <property name="can_focus">True</property>
+-			  <property name="label" translatable="yes">Double click</property>
+-			  <property name="use_underline">True</property>
+-			  <property name="relief">GTK_RELIEF_NORMAL</property>
+-			  <property name="focus_on_click">True</property>
+-			  <property name="active">True</property>
+-			  <property name="inconsistent">False</property>
+-			  <property name="draw_indicator">True</property>
+-			  <property name="group">browserSingleClickButton</property>
+-			  <signal name="toggled" handler="OnDoubleClickToggled" last_modification_time="Sun, 30 Apr 2006 13:27:08 GMT"/>
+-			</widget>
+-			<packing>
+-			  <property name="padding">20</property>
+-			  <property name="expand">False</property>
+-			  <property name="fill">False</property>
+-			</packing>
+-		      </child>
+-		    </widget>
+-		    <packing>
+-		      <property name="padding">0</property>
+-		      <property name="expand">False</property>
+-		      <property name="fill">False</property>
+-		    </packing>
+-		  </child>
+-		</widget>
+-		<packing>
+-		  <property name="tab_expand">False</property>
+-		  <property name="tab_fill">True</property>
+-		</packing>
+-	      </child>
+-
+-	      <child>
+-		<widget class="GtkLabel" id="label429">
+-		  <property name="visible">True</property>
+-		  <property name="label" translatable="yes">General</property>
+-		  <property name="use_underline">False</property>
+-		  <property name="use_markup">False</property>
+-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+-		  <property name="wrap">False</property>
+-		  <property name="selectable">False</property>
+-		  <property name="xalign">0.5</property>
+-		  <property name="yalign">0.5</property>
+-		  <property name="xpad">0</property>
+-		  <property name="ypad">0</property>
+-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-		  <property name="width_chars">-1</property>
+-		  <property name="single_line_mode">False</property>
+-		  <property name="angle">0</property>
+-		</widget>
+-		<packing>
+-		  <property name="type">tab</property>
+-		</packing>
+-	      </child>
+-
+-	      <child>
+ 		<widget class="GtkHBox" id="hbox450">
+ 		  <property name="visible">True</property>
+ 		  <property name="homogeneous">False</property>

Deleted: drop-gnome-sharp.patch
===================================================================
--- drop-gnome-sharp.patch	2018-12-29 21:49:59 UTC (rev 418933)
+++ drop-gnome-sharp.patch	2018-12-29 21:50:04 UTC (rev 418934)
@@ -1,402 +0,0 @@
-diff -Naur lat-1.2.4.orig/configure.ac lat-1.2.4/configure.ac
---- lat-1.2.4.orig/configure.ac	2012-11-18 10:48:06.000000000 +0100
-+++ lat-1.2.4/configure.ac	2017-01-23 22:02:06.809880447 +0100
-@@ -28,7 +28,6 @@
- 
- PKG_CHECK_MODULES(GTKSHARP,
- 		  gtk-sharp-2.0 >= $GTKSHARP_REQUIRED \
--		  gnome-sharp-2.0 >= $GTKSHARP_REQUIRED \
- 		  gconf-sharp-2.0 >= $GTKSHARP_REQUIRED \
- 		  glade-sharp-2.0 >= $GTKSHARP_REQUIRED)
- 
-diff -Naur lat-1.2.4.orig/lat/gtk-sharp-beans/Global.cs lat-1.2.4/lat/gtk-sharp-beans/Global.cs
---- lat-1.2.4.orig/lat/gtk-sharp-beans/Global.cs	1970-01-01 01:00:00.000000000 +0100
-+++ lat-1.2.4/lat/gtk-sharp-beans/Global.cs	2017-01-23 23:23:02.713050743 +0100
-@@ -0,0 +1,44 @@
-+// GtkBeans.Global.cs
-+//
-+// Author(s):
-+//      Stephane Delcroix <stephane at delcroix.org>
-+//
-+// Copyright (c) 2009 Novell, Inc.
-+//
-+// This program is free software; you can redistribute it and/or
-+// modify it under the terms of version 2 of the Lesser GNU General 
-+// Public License as published by the Free Software Foundation.
-+//
-+// This program is distributed in the hope that it will be useful,
-+// but WITHOUT ANY WARRANTY; without even the implied warranty of
-+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+// Lesser General Public License for more details.
-+//
-+// You should have received a copy of the GNU Lesser General Public
-+// License along with this program; if not, see <http://www.gnu.org/licenses/>.
-+
-+using System;
-+using System.Collections;
-+using System.Runtime.InteropServices;
-+
-+namespace GtkBeans {
-+	public static class Global {
-+		[DllImport("libgtk-x11-2.0.so")]
-+		static extern unsafe bool gtk_show_uri(IntPtr screen, IntPtr uri, uint timestamp, out IntPtr error);
-+
-+		public static unsafe bool ShowUri(Gdk.Screen screen, string uri, uint timestamp) {
-+			IntPtr native_uri = GLib.Marshaller.StringToPtrGStrdup (uri);
-+			IntPtr error = IntPtr.Zero;
-+			bool raw_ret = gtk_show_uri(screen == null ? IntPtr.Zero : screen.Handle, native_uri, timestamp, out error);
-+			bool ret = raw_ret;
-+			GLib.Marshaller.Free (native_uri);
-+			if (error != IntPtr.Zero) throw new GLib.GException (error);
-+			return ret;
-+		}
-+
-+		public static bool ShowUri (Gdk.Screen screen, string uri)
-+		{
-+			return ShowUri (screen, uri, Gdk.EventHelper.GetTime (new Gdk.Event(IntPtr.Zero)));
-+		}
-+	}
-+}
-diff -Naur lat-1.2.4.orig/lat/Main.cs lat-1.2.4/lat/Main.cs
---- lat-1.2.4.orig/lat/Main.cs	2012-11-18 10:48:06.000000000 +0100
-+++ lat-1.2.4/lat/Main.cs	2017-01-23 22:25:54.561847898 +0100
-@@ -21,7 +21,6 @@
- using System;
- using System.Text;
- using Gtk;
--using Gnome;
- using lat;
- 
- public class Global
-@@ -119,9 +118,9 @@
- 
- 		try {
- 		
--			Program program = new Program (Defines.PACKAGE, Defines.VERSION, Modules.UI, args);					
--			Global.Window = new MainWindow (program);		
--			program.Run ();
-+			Gtk.Application.Init ();
-+			Global.Window = new MainWindow ();		
-+			Gtk.Application.Run ();
- 		
- 		} catch (Exception e) {
- 		
-diff -Naur lat-1.2.4.orig/lat/Makefile.am lat-1.2.4/lat/Makefile.am
---- lat-1.2.4.orig/lat/Makefile.am	2012-01-09 21:24:10.000000000 +0100
-+++ lat-1.2.4/lat/Makefile.am	2017-01-23 23:19:46.120628232 +0100
-@@ -57,7 +57,8 @@
- 	ViewDialog.cs \
- 	ViewPluginManager.cs \
- 	ViewsTreeView.cs \
--	Window.cs
-+	Window.cs \
-+	gtk-sharp-beans/*.cs
- 
- SOURCES_BUILD = $(addprefix $(srcdir)/, $(CSFILES))
- 
-@@ -94,7 +95,7 @@
- RESOURCES_BUILD = $(addprefix /resource:$(top_srcdir)/resources/, $(RESOURCES))
- 
- $(ASSEMBLY).exe: $(SOURCES_BUILD) $(AVAHI_CSFILES)
--	$(CSC) -out:$@ $(SOURCES_BUILD) $(AVAHI_CSFILES) $(REFERENCES_BUILD) $(AVAHI_REFERENCES) $(RESOURCES_BUILD) $(GTKSHARP_LIBS)
-+	$(CSC) -out:$@ -unsafe $(SOURCES_BUILD) $(AVAHI_CSFILES) $(REFERENCES_BUILD) $(AVAHI_REFERENCES) $(RESOURCES_BUILD) $(GTKSHARP_LIBS)
- 
- all: $(ASSEMBLY).exe
- 
-diff -Naur lat-1.2.4.orig/lat/plugins/ActiveDirectoryCoreViews/dialogs.glade lat-1.2.4/lat/plugins/ActiveDirectoryCoreViews/dialogs.glade
---- lat-1.2.4.orig/lat/plugins/ActiveDirectoryCoreViews/dialogs.glade	2012-01-09 21:24:10.000000000 +0100
-+++ lat-1.2.4/lat/plugins/ActiveDirectoryCoreViews/dialogs.glade	2017-01-23 22:34:19.703805008 +0100
-@@ -2,7 +2,6 @@
- <!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
- 
- <glade-interface>
--<requires lib="gnome"/>
- 
- <widget class="GtkDialog" id="editAdComputerDialog">
-   <property name="visible">True</property>
-diff -Naur lat-1.2.4.orig/lat/plugins/JpegAttributeViewer/dialog.glade lat-1.2.4/lat/plugins/JpegAttributeViewer/dialog.glade
---- lat-1.2.4.orig/lat/plugins/JpegAttributeViewer/dialog.glade	2012-01-09 21:24:10.000000000 +0100
-+++ lat-1.2.4/lat/plugins/JpegAttributeViewer/dialog.glade	2017-01-23 22:34:12.676928731 +0100
-@@ -2,7 +2,6 @@
- <!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
- 
- <glade-interface>
--<requires lib="gnome"/>
- 
- <widget class="GtkDialog" id="jpegAttributeViewDialog">
-   <property name="visible">True</property>
-diff -Naur lat-1.2.4.orig/lat/plugins/PosixCoreViews/dialogs.glade lat-1.2.4/lat/plugins/PosixCoreViews/dialogs.glade
---- lat-1.2.4.orig/lat/plugins/PosixCoreViews/dialogs.glade	2012-01-09 21:24:10.000000000 +0100
-+++ lat-1.2.4/lat/plugins/PosixCoreViews/dialogs.glade	2017-01-23 22:34:25.383974401 +0100
-@@ -2,7 +2,6 @@
- <!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
- 
- <glade-interface>
--<requires lib="gnome"/>
- 
- <widget class="GtkDialog" id="editContactDialog">
-   <property name="visible">True</property>
-diff -Naur lat-1.2.4.orig/lat/Preferences.cs lat-1.2.4/lat/Preferences.cs
---- lat-1.2.4.orig/lat/Preferences.cs	2012-01-09 21:24:10.000000000 +0100
-+++ lat-1.2.4/lat/Preferences.cs	2017-01-23 23:08:39.554428963 +0100
-@@ -109,16 +109,13 @@
- 		[Glade.Widget] TreeView profilesTreeView;
- 
- 		ListStore profileStore;
--		Gnome.Program program;
- 		bool gettingHelp = false;
- 			
--		public PreferencesDialog (Gnome.Program program)
-+		public PreferencesDialog ()
- 		{
- 			ui = new Glade.XML (null, "lat.glade", "preferencesDialog", null);
- 			ui.Autoconnect (this);
- 			
--			this.program = program;
--			
- 			profileStore = new ListStore (typeof (string));
- 			profilesTreeView.Model = profileStore;
- 			profileStore.SetSortColumnId (0, SortType.Ascending);
-@@ -239,11 +236,7 @@
- 
- 				gettingHelp = true;
- 
--				Gnome.Help.DisplayDesktopOnScreen (program, 
--					Defines.PACKAGE, 
--					"lat.xml", 
--					"lat-preferences", 
--					Gdk.Screen.Default);
-+				GtkBeans.Global.ShowUri(null, "ghelp:lat?lat-preferences");
- 
- 			} catch (Exception e) {
- 
-diff -Naur lat-1.2.4.orig/lat/ViewDataTreeView.cs lat-1.2.4/lat/ViewDataTreeView.cs
---- lat-1.2.4.orig/lat/ViewDataTreeView.cs	2012-01-10 20:40:21.000000000 +0100
-+++ lat-1.2.4/lat/ViewDataTreeView.cs	2017-01-23 23:05:52.962872744 +0100
-@@ -313,7 +313,7 @@
- 
- 			try {
- 			
--				Gnome.Url.Show ("mailto:" + url);
-+				GtkBeans.Global.ShowUri(null, "mailto:" + url);
- 
- 			} catch (Exception e) {
- 
-@@ -470,7 +470,7 @@
- 
- 			try {
- 			
--				Gnome.Url.Show (url);
-+				GtkBeans.Global.ShowUri(null, url);
- 
- 			} catch (Exception e) {
- 
-@@ -533,4 +533,4 @@
- 			this.ShowAll ();			
- 		}
- 	}
--}
-\ Nincs új sor a fájl végén
-+}
-diff -Naur lat-1.2.4.orig/lat/Window.cs lat-1.2.4/lat/Window.cs
---- lat-1.2.4.orig/lat/Window.cs	2012-04-10 13:50:08.000000000 +0200
-+++ lat-1.2.4/lat/Window.cs	2017-01-23 23:16:32.824967378 +0100
-@@ -19,7 +19,6 @@
- //
- 
- using Gtk;
--using Gnome;
- using System;
- using System.Text;
- using Novell.Directory.Ldap;
-@@ -93,9 +92,7 @@
- 		[Glade.Widget] Gtk.Button searchBaseButton;
- 
- 		[Glade.Widget] Gtk.Image sslImage;
--		[Glade.Widget] Gnome.AppBar appBar;
--		
--		Gnome.Program program;
-+		[Glade.Widget] Gtk.Statusbar statusBar;
- 		
- 		AccelGroup newAccelGroup;
- 		
-@@ -121,10 +118,8 @@
- 		ServiceFinder finder;
- #endif
- 		
--		public MainWindow (Gnome.Program mainProgram)
-+		public MainWindow ()
- 		{
--			program = mainProgram;
--			
- 			ui = new Glade.XML (null, "lat.glade", "mainWindow", null);
- 			ui.Autoconnect (this);
- 
-@@ -575,8 +570,8 @@
- 				else
- 					msg = String.Format("Bind DN: {0}", conn.AuthDN);
- 
--				appBar.Pop ();
--				appBar.Push (msg);
-+				statusBar.Pop (0);
-+				statusBar.Push (0, msg);
- 
- 				sslImage.Pixbuf = Util.GetSSLIcon (conn.UseSSL);
- 				
-@@ -587,8 +582,8 @@
- 
- 		public void WriteStatusMessage (string msg)
- 		{
--			appBar.Pop ();
--			appBar.Push (msg);
-+			statusBar.Pop (0);
-+			statusBar.Push (0, msg);
- 		}
- 		
- 		// Handlers
-@@ -761,7 +756,7 @@
- 
- 		public void OnPreferencesActivate (object sender, EventArgs args)
- 		{
--			new PreferencesDialog (program);
-+			new PreferencesDialog ();
- 			
- 			Global.Connections.Save ();
- 		}
-@@ -901,7 +896,7 @@
- 			finder.Stop ();
- #endif
- 
--			program.Quit ();
-+			Gtk.Main.Quit ();
- 		}
- 
- 		public void OnSearchSelected (object o, SearchResultSelectedEventArgs args)
-@@ -972,8 +967,8 @@
- 				searchTreeView.UpdateSearchResults (searchResults);
- 
- 				string msg = String.Format ("Found {0} matching entries", searchResults.Length);
--				appBar.Pop ();
--				appBar.Push (msg);
-+				statusBar.Pop (0);
-+				statusBar.Push (0, msg);
- 			}
- 		}
- 
-@@ -1055,11 +1050,7 @@
- 		{
- 			try {
- 
--				Gnome.Help.DisplayDesktopOnScreen (program, 
--					Defines.PACKAGE, 
--					"lat.xml", 
--					null, 
--					Gdk.Screen.Default);
-+				GtkBeans.Global.ShowUri(null, "ghelp:lat");
- 
- 			} catch (Exception e) {
- 
-diff -Naur lat-1.2.4.orig/resources/lat.glade lat-1.2.4/resources/lat.glade
---- lat-1.2.4.orig/resources/lat.glade	2012-04-10 13:54:27.000000000 +0200
-+++ lat-1.2.4/resources/lat.glade	2017-01-23 22:54:15.512342180 +0100
-@@ -2,7 +2,6 @@
- <!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
- 
- <glade-interface>
--<requires lib="gnome"/>
- 
- <widget class="GtkDialog" id="connectionDialog">
-   <property name="visible">True</property>
-@@ -2311,8 +2310,8 @@
- 		  <child>
- 		    <widget class="GtkImageMenuItem" id="newMenuItem">
- 		      <property name="visible">True</property>
--		      <property name="stock_item">GNOMEUIINFO_MENU_NEW_ITEM</property>
--		      <property name="label" translatable="yes">_New</property>
-+		      <property name="label">gtk-new</property>
-+		      <property name="use_stock">True</property>
- 		      <property name="use_underline">True</property>
- 		    </widget>
- 		  </child>
-@@ -2472,7 +2471,8 @@
- 		  <child>
- 		    <widget class="GtkImageMenuItem" id="quit">
- 		      <property name="visible">True</property>
--		      <property name="stock_item">GNOMEUIINFO_MENU_EXIT_ITEM</property>
-+		      <property name="label">gtk-quit</property>
-+		      <property name="use_stock">True</property>
- 		      <signal name="activate" handler="OnQuitActivate" last_modification_time="Thu, 24 Feb 2005 15:40:49 GMT"/>
- 		    </widget>
- 		  </child>
-@@ -2493,7 +2493,8 @@
- 		  <child>
- 		    <widget class="GtkImageMenuItem" id="cut">
- 		      <property name="visible">True</property>
--		      <property name="stock_item">GNOMEUIINFO_MENU_CUT_ITEM</property>
-+		      <property name="label">gtk-cut</property>
-+		      <property name="use_stock">True</property>
- 		      <signal name="activate" handler="OnCutActivate" last_modification_time="Sun, 27 Feb 2005 17:31:44 GMT"/>
- 		    </widget>
- 		  </child>
-@@ -2501,7 +2502,8 @@
- 		  <child>
- 		    <widget class="GtkImageMenuItem" id="copy">
- 		      <property name="visible">True</property>
--		      <property name="stock_item">GNOMEUIINFO_MENU_COPY_ITEM</property>
-+		      <property name="label">gtk-copy</property>
-+		      <property name="use_stock">True</property>
- 		      <signal name="activate" handler="OnCopyActivate" last_modification_time="Sun, 27 Feb 2005 17:31:44 GMT"/>
- 		    </widget>
- 		  </child>
-@@ -2509,7 +2511,8 @@
- 		  <child>
- 		    <widget class="GtkImageMenuItem" id="paste">
- 		      <property name="visible">True</property>
--		      <property name="stock_item">GNOMEUIINFO_MENU_PASTE_ITEM</property>
-+		      <property name="label">gtk-paste</property>
-+		      <property name="use_stock">True</property>
- 		      <signal name="activate" handler="OnPasteActivate" last_modification_time="Sun, 27 Feb 2005 17:32:05 GMT"/>
- 		    </widget>
- 		  </child>
-@@ -2538,7 +2541,8 @@
- 		  <child>
- 		    <widget class="GtkImageMenuItem" id="Properties">
- 		      <property name="visible">True</property>
--		      <property name="stock_item">GNOMEUIINFO_MENU_PROPERTIES_ITEM</property>
-+		      <property name="label">gtk-properties</property>
-+		      <property name="use_stock">True</property>
- 		      <signal name="activate" handler="OnPropertiesActivate" last_modification_time="Fri, 08 Jul 2005 20:08:04 GMT"/>
- 		    </widget>
- 		  </child>
-@@ -2552,7 +2556,8 @@
- 		  <child>
- 		    <widget class="GtkImageMenuItem" id="preferences1">
- 		      <property name="visible">True</property>
--		      <property name="stock_item">GNOMEUIINFO_MENU_PREFERENCES_ITEM</property>
-+		      <property name="label">gtk-preferences</property>
-+		      <property name="use_stock">True</property>
- 		      <signal name="activate" handler="OnPreferencesActivate" last_modification_time="Sun, 30 Apr 2006 12:36:07 GMT"/>
- 		    </widget>
- 		  </child>
-@@ -2700,7 +2705,8 @@
- 		  <child>
- 		    <widget class="GtkImageMenuItem" id="about1">
- 		      <property name="visible">True</property>
--		      <property name="stock_item">GNOMEUIINFO_MENU_ABOUT_ITEM</property>
-+		      <property name="label">gtk-about</property>
-+		      <property name="use_stock">True</property>
- 		      <signal name="activate" handler="OnAboutActivate" last_modification_time="Thu, 24 Feb 2005 15:41:47 GMT"/>
- 		    </widget>
- 		  </child>
-@@ -5195,10 +5201,8 @@
- 	  </child>
- 
- 	  <child>
--	    <widget class="GnomeAppBar" id="appBar">
-+	    <widget class="GtkStatusbar" id="statusBar">
- 	      <property name="visible">True</property>
--	      <property name="has_progress">False</property>
--	      <property name="has_status">True</property>
- 	    </widget>
- 	    <packing>
- 	      <property name="padding">5</property>

Copied: lat/repos/community-any/drop-gnome-sharp.patch (from rev 418933, lat/trunk/drop-gnome-sharp.patch)
===================================================================
--- drop-gnome-sharp.patch	                        (rev 0)
+++ drop-gnome-sharp.patch	2018-12-29 21:50:04 UTC (rev 418934)
@@ -0,0 +1,402 @@
+diff -Naur lat-1.2.4.orig/configure.ac lat-1.2.4/configure.ac
+--- lat-1.2.4.orig/configure.ac	2012-11-18 10:48:06.000000000 +0100
++++ lat-1.2.4/configure.ac	2017-01-23 22:02:06.809880447 +0100
+@@ -28,7 +28,6 @@
+ 
+ PKG_CHECK_MODULES(GTKSHARP,
+ 		  gtk-sharp-2.0 >= $GTKSHARP_REQUIRED \
+-		  gnome-sharp-2.0 >= $GTKSHARP_REQUIRED \
+ 		  gconf-sharp-2.0 >= $GTKSHARP_REQUIRED \
+ 		  glade-sharp-2.0 >= $GTKSHARP_REQUIRED)
+ 
+diff -Naur lat-1.2.4.orig/lat/gtk-sharp-beans/Global.cs lat-1.2.4/lat/gtk-sharp-beans/Global.cs
+--- lat-1.2.4.orig/lat/gtk-sharp-beans/Global.cs	1970-01-01 01:00:00.000000000 +0100
++++ lat-1.2.4/lat/gtk-sharp-beans/Global.cs	2017-01-23 23:23:02.713050743 +0100
+@@ -0,0 +1,44 @@
++// GtkBeans.Global.cs
++//
++// Author(s):
++//      Stephane Delcroix <stephane at delcroix.org>
++//
++// Copyright (c) 2009 Novell, Inc.
++//
++// This program is free software; you can redistribute it and/or
++// modify it under the terms of version 2 of the Lesser GNU General 
++// Public License as published by the Free Software Foundation.
++//
++// This program is distributed in the hope that it will be useful,
++// but WITHOUT ANY WARRANTY; without even the implied warranty of
++// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++// Lesser General Public License for more details.
++//
++// You should have received a copy of the GNU Lesser General Public
++// License along with this program; if not, see <http://www.gnu.org/licenses/>.
++
++using System;
++using System.Collections;
++using System.Runtime.InteropServices;
++
++namespace GtkBeans {
++	public static class Global {
++		[DllImport("libgtk-x11-2.0.so")]
++		static extern unsafe bool gtk_show_uri(IntPtr screen, IntPtr uri, uint timestamp, out IntPtr error);
++
++		public static unsafe bool ShowUri(Gdk.Screen screen, string uri, uint timestamp) {
++			IntPtr native_uri = GLib.Marshaller.StringToPtrGStrdup (uri);
++			IntPtr error = IntPtr.Zero;
++			bool raw_ret = gtk_show_uri(screen == null ? IntPtr.Zero : screen.Handle, native_uri, timestamp, out error);
++			bool ret = raw_ret;
++			GLib.Marshaller.Free (native_uri);
++			if (error != IntPtr.Zero) throw new GLib.GException (error);
++			return ret;
++		}
++
++		public static bool ShowUri (Gdk.Screen screen, string uri)
++		{
++			return ShowUri (screen, uri, Gdk.EventHelper.GetTime (new Gdk.Event(IntPtr.Zero)));
++		}
++	}
++}
+diff -Naur lat-1.2.4.orig/lat/Main.cs lat-1.2.4/lat/Main.cs
+--- lat-1.2.4.orig/lat/Main.cs	2012-11-18 10:48:06.000000000 +0100
++++ lat-1.2.4/lat/Main.cs	2017-01-23 22:25:54.561847898 +0100
+@@ -21,7 +21,6 @@
+ using System;
+ using System.Text;
+ using Gtk;
+-using Gnome;
+ using lat;
+ 
+ public class Global
+@@ -119,9 +118,9 @@
+ 
+ 		try {
+ 		
+-			Program program = new Program (Defines.PACKAGE, Defines.VERSION, Modules.UI, args);					
+-			Global.Window = new MainWindow (program);		
+-			program.Run ();
++			Gtk.Application.Init ();
++			Global.Window = new MainWindow ();		
++			Gtk.Application.Run ();
+ 		
+ 		} catch (Exception e) {
+ 		
+diff -Naur lat-1.2.4.orig/lat/Makefile.am lat-1.2.4/lat/Makefile.am
+--- lat-1.2.4.orig/lat/Makefile.am	2012-01-09 21:24:10.000000000 +0100
++++ lat-1.2.4/lat/Makefile.am	2017-01-23 23:19:46.120628232 +0100
+@@ -57,7 +57,8 @@
+ 	ViewDialog.cs \
+ 	ViewPluginManager.cs \
+ 	ViewsTreeView.cs \
+-	Window.cs
++	Window.cs \
++	gtk-sharp-beans/*.cs
+ 
+ SOURCES_BUILD = $(addprefix $(srcdir)/, $(CSFILES))
+ 
+@@ -94,7 +95,7 @@
+ RESOURCES_BUILD = $(addprefix /resource:$(top_srcdir)/resources/, $(RESOURCES))
+ 
+ $(ASSEMBLY).exe: $(SOURCES_BUILD) $(AVAHI_CSFILES)
+-	$(CSC) -out:$@ $(SOURCES_BUILD) $(AVAHI_CSFILES) $(REFERENCES_BUILD) $(AVAHI_REFERENCES) $(RESOURCES_BUILD) $(GTKSHARP_LIBS)
++	$(CSC) -out:$@ -unsafe $(SOURCES_BUILD) $(AVAHI_CSFILES) $(REFERENCES_BUILD) $(AVAHI_REFERENCES) $(RESOURCES_BUILD) $(GTKSHARP_LIBS)
+ 
+ all: $(ASSEMBLY).exe
+ 
+diff -Naur lat-1.2.4.orig/lat/plugins/ActiveDirectoryCoreViews/dialogs.glade lat-1.2.4/lat/plugins/ActiveDirectoryCoreViews/dialogs.glade
+--- lat-1.2.4.orig/lat/plugins/ActiveDirectoryCoreViews/dialogs.glade	2012-01-09 21:24:10.000000000 +0100
++++ lat-1.2.4/lat/plugins/ActiveDirectoryCoreViews/dialogs.glade	2017-01-23 22:34:19.703805008 +0100
+@@ -2,7 +2,6 @@
+ <!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
+ 
+ <glade-interface>
+-<requires lib="gnome"/>
+ 
+ <widget class="GtkDialog" id="editAdComputerDialog">
+   <property name="visible">True</property>
+diff -Naur lat-1.2.4.orig/lat/plugins/JpegAttributeViewer/dialog.glade lat-1.2.4/lat/plugins/JpegAttributeViewer/dialog.glade
+--- lat-1.2.4.orig/lat/plugins/JpegAttributeViewer/dialog.glade	2012-01-09 21:24:10.000000000 +0100
++++ lat-1.2.4/lat/plugins/JpegAttributeViewer/dialog.glade	2017-01-23 22:34:12.676928731 +0100
+@@ -2,7 +2,6 @@
+ <!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
+ 
+ <glade-interface>
+-<requires lib="gnome"/>
+ 
+ <widget class="GtkDialog" id="jpegAttributeViewDialog">
+   <property name="visible">True</property>
+diff -Naur lat-1.2.4.orig/lat/plugins/PosixCoreViews/dialogs.glade lat-1.2.4/lat/plugins/PosixCoreViews/dialogs.glade
+--- lat-1.2.4.orig/lat/plugins/PosixCoreViews/dialogs.glade	2012-01-09 21:24:10.000000000 +0100
++++ lat-1.2.4/lat/plugins/PosixCoreViews/dialogs.glade	2017-01-23 22:34:25.383974401 +0100
+@@ -2,7 +2,6 @@
+ <!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
+ 
+ <glade-interface>
+-<requires lib="gnome"/>
+ 
+ <widget class="GtkDialog" id="editContactDialog">
+   <property name="visible">True</property>
+diff -Naur lat-1.2.4.orig/lat/Preferences.cs lat-1.2.4/lat/Preferences.cs
+--- lat-1.2.4.orig/lat/Preferences.cs	2012-01-09 21:24:10.000000000 +0100
++++ lat-1.2.4/lat/Preferences.cs	2017-01-23 23:08:39.554428963 +0100
+@@ -109,16 +109,13 @@
+ 		[Glade.Widget] TreeView profilesTreeView;
+ 
+ 		ListStore profileStore;
+-		Gnome.Program program;
+ 		bool gettingHelp = false;
+ 			
+-		public PreferencesDialog (Gnome.Program program)
++		public PreferencesDialog ()
+ 		{
+ 			ui = new Glade.XML (null, "lat.glade", "preferencesDialog", null);
+ 			ui.Autoconnect (this);
+ 			
+-			this.program = program;
+-			
+ 			profileStore = new ListStore (typeof (string));
+ 			profilesTreeView.Model = profileStore;
+ 			profileStore.SetSortColumnId (0, SortType.Ascending);
+@@ -239,11 +236,7 @@
+ 
+ 				gettingHelp = true;
+ 
+-				Gnome.Help.DisplayDesktopOnScreen (program, 
+-					Defines.PACKAGE, 
+-					"lat.xml", 
+-					"lat-preferences", 
+-					Gdk.Screen.Default);
++				GtkBeans.Global.ShowUri(null, "ghelp:lat?lat-preferences");
+ 
+ 			} catch (Exception e) {
+ 
+diff -Naur lat-1.2.4.orig/lat/ViewDataTreeView.cs lat-1.2.4/lat/ViewDataTreeView.cs
+--- lat-1.2.4.orig/lat/ViewDataTreeView.cs	2012-01-10 20:40:21.000000000 +0100
++++ lat-1.2.4/lat/ViewDataTreeView.cs	2017-01-23 23:05:52.962872744 +0100
+@@ -313,7 +313,7 @@
+ 
+ 			try {
+ 			
+-				Gnome.Url.Show ("mailto:" + url);
++				GtkBeans.Global.ShowUri(null, "mailto:" + url);
+ 
+ 			} catch (Exception e) {
+ 
+@@ -470,7 +470,7 @@
+ 
+ 			try {
+ 			
+-				Gnome.Url.Show (url);
++				GtkBeans.Global.ShowUri(null, url);
+ 
+ 			} catch (Exception e) {
+ 
+@@ -533,4 +533,4 @@
+ 			this.ShowAll ();			
+ 		}
+ 	}
+-}
+\ Nincs új sor a fájl végén
++}
+diff -Naur lat-1.2.4.orig/lat/Window.cs lat-1.2.4/lat/Window.cs
+--- lat-1.2.4.orig/lat/Window.cs	2012-04-10 13:50:08.000000000 +0200
++++ lat-1.2.4/lat/Window.cs	2017-01-23 23:16:32.824967378 +0100
+@@ -19,7 +19,6 @@
+ //
+ 
+ using Gtk;
+-using Gnome;
+ using System;
+ using System.Text;
+ using Novell.Directory.Ldap;
+@@ -93,9 +92,7 @@
+ 		[Glade.Widget] Gtk.Button searchBaseButton;
+ 
+ 		[Glade.Widget] Gtk.Image sslImage;
+-		[Glade.Widget] Gnome.AppBar appBar;
+-		
+-		Gnome.Program program;
++		[Glade.Widget] Gtk.Statusbar statusBar;
+ 		
+ 		AccelGroup newAccelGroup;
+ 		
+@@ -121,10 +118,8 @@
+ 		ServiceFinder finder;
+ #endif
+ 		
+-		public MainWindow (Gnome.Program mainProgram)
++		public MainWindow ()
+ 		{
+-			program = mainProgram;
+-			
+ 			ui = new Glade.XML (null, "lat.glade", "mainWindow", null);
+ 			ui.Autoconnect (this);
+ 
+@@ -575,8 +570,8 @@
+ 				else
+ 					msg = String.Format("Bind DN: {0}", conn.AuthDN);
+ 
+-				appBar.Pop ();
+-				appBar.Push (msg);
++				statusBar.Pop (0);
++				statusBar.Push (0, msg);
+ 
+ 				sslImage.Pixbuf = Util.GetSSLIcon (conn.UseSSL);
+ 				
+@@ -587,8 +582,8 @@
+ 
+ 		public void WriteStatusMessage (string msg)
+ 		{
+-			appBar.Pop ();
+-			appBar.Push (msg);
++			statusBar.Pop (0);
++			statusBar.Push (0, msg);
+ 		}
+ 		
+ 		// Handlers
+@@ -761,7 +756,7 @@
+ 
+ 		public void OnPreferencesActivate (object sender, EventArgs args)
+ 		{
+-			new PreferencesDialog (program);
++			new PreferencesDialog ();
+ 			
+ 			Global.Connections.Save ();
+ 		}
+@@ -901,7 +896,7 @@
+ 			finder.Stop ();
+ #endif
+ 
+-			program.Quit ();
++			Gtk.Main.Quit ();
+ 		}
+ 
+ 		public void OnSearchSelected (object o, SearchResultSelectedEventArgs args)
+@@ -972,8 +967,8 @@
+ 				searchTreeView.UpdateSearchResults (searchResults);
+ 
+ 				string msg = String.Format ("Found {0} matching entries", searchResults.Length);
+-				appBar.Pop ();
+-				appBar.Push (msg);
++				statusBar.Pop (0);
++				statusBar.Push (0, msg);
+ 			}
+ 		}
+ 
+@@ -1055,11 +1050,7 @@
+ 		{
+ 			try {
+ 
+-				Gnome.Help.DisplayDesktopOnScreen (program, 
+-					Defines.PACKAGE, 
+-					"lat.xml", 
+-					null, 
+-					Gdk.Screen.Default);
++				GtkBeans.Global.ShowUri(null, "ghelp:lat");
+ 
+ 			} catch (Exception e) {
+ 
+diff -Naur lat-1.2.4.orig/resources/lat.glade lat-1.2.4/resources/lat.glade
+--- lat-1.2.4.orig/resources/lat.glade	2012-04-10 13:54:27.000000000 +0200
++++ lat-1.2.4/resources/lat.glade	2017-01-23 22:54:15.512342180 +0100
+@@ -2,7 +2,6 @@
+ <!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
+ 
+ <glade-interface>
+-<requires lib="gnome"/>
+ 
+ <widget class="GtkDialog" id="connectionDialog">
+   <property name="visible">True</property>
+@@ -2311,8 +2310,8 @@
+ 		  <child>
+ 		    <widget class="GtkImageMenuItem" id="newMenuItem">
+ 		      <property name="visible">True</property>
+-		      <property name="stock_item">GNOMEUIINFO_MENU_NEW_ITEM</property>
+-		      <property name="label" translatable="yes">_New</property>
++		      <property name="label">gtk-new</property>
++		      <property name="use_stock">True</property>
+ 		      <property name="use_underline">True</property>
+ 		    </widget>
+ 		  </child>
+@@ -2472,7 +2471,8 @@
+ 		  <child>
+ 		    <widget class="GtkImageMenuItem" id="quit">
+ 		      <property name="visible">True</property>
+-		      <property name="stock_item">GNOMEUIINFO_MENU_EXIT_ITEM</property>
++		      <property name="label">gtk-quit</property>
++		      <property name="use_stock">True</property>
+ 		      <signal name="activate" handler="OnQuitActivate" last_modification_time="Thu, 24 Feb 2005 15:40:49 GMT"/>
+ 		    </widget>
+ 		  </child>
+@@ -2493,7 +2493,8 @@
+ 		  <child>
+ 		    <widget class="GtkImageMenuItem" id="cut">
+ 		      <property name="visible">True</property>
+-		      <property name="stock_item">GNOMEUIINFO_MENU_CUT_ITEM</property>
++		      <property name="label">gtk-cut</property>
++		      <property name="use_stock">True</property>
+ 		      <signal name="activate" handler="OnCutActivate" last_modification_time="Sun, 27 Feb 2005 17:31:44 GMT"/>
+ 		    </widget>
+ 		  </child>
+@@ -2501,7 +2502,8 @@
+ 		  <child>
+ 		    <widget class="GtkImageMenuItem" id="copy">
+ 		      <property name="visible">True</property>
+-		      <property name="stock_item">GNOMEUIINFO_MENU_COPY_ITEM</property>
++		      <property name="label">gtk-copy</property>
++		      <property name="use_stock">True</property>
+ 		      <signal name="activate" handler="OnCopyActivate" last_modification_time="Sun, 27 Feb 2005 17:31:44 GMT"/>
+ 		    </widget>
+ 		  </child>
+@@ -2509,7 +2511,8 @@
+ 		  <child>
+ 		    <widget class="GtkImageMenuItem" id="paste">
+ 		      <property name="visible">True</property>
+-		      <property name="stock_item">GNOMEUIINFO_MENU_PASTE_ITEM</property>
++		      <property name="label">gtk-paste</property>
++		      <property name="use_stock">True</property>
+ 		      <signal name="activate" handler="OnPasteActivate" last_modification_time="Sun, 27 Feb 2005 17:32:05 GMT"/>
+ 		    </widget>
+ 		  </child>
+@@ -2538,7 +2541,8 @@
+ 		  <child>
+ 		    <widget class="GtkImageMenuItem" id="Properties">
+ 		      <property name="visible">True</property>
+-		      <property name="stock_item">GNOMEUIINFO_MENU_PROPERTIES_ITEM</property>
++		      <property name="label">gtk-properties</property>
++		      <property name="use_stock">True</property>
+ 		      <signal name="activate" handler="OnPropertiesActivate" last_modification_time="Fri, 08 Jul 2005 20:08:04 GMT"/>
+ 		    </widget>
+ 		  </child>
+@@ -2552,7 +2556,8 @@
+ 		  <child>
+ 		    <widget class="GtkImageMenuItem" id="preferences1">
+ 		      <property name="visible">True</property>
+-		      <property name="stock_item">GNOMEUIINFO_MENU_PREFERENCES_ITEM</property>
++		      <property name="label">gtk-preferences</property>
++		      <property name="use_stock">True</property>
+ 		      <signal name="activate" handler="OnPreferencesActivate" last_modification_time="Sun, 30 Apr 2006 12:36:07 GMT"/>
+ 		    </widget>
+ 		  </child>
+@@ -2700,7 +2705,8 @@
+ 		  <child>
+ 		    <widget class="GtkImageMenuItem" id="about1">
+ 		      <property name="visible">True</property>
+-		      <property name="stock_item">GNOMEUIINFO_MENU_ABOUT_ITEM</property>
++		      <property name="label">gtk-about</property>
++		      <property name="use_stock">True</property>
+ 		      <signal name="activate" handler="OnAboutActivate" last_modification_time="Thu, 24 Feb 2005 15:41:47 GMT"/>
+ 		    </widget>
+ 		  </child>
+@@ -5195,10 +5201,8 @@
+ 	  </child>
+ 
+ 	  <child>
+-	    <widget class="GnomeAppBar" id="appBar">
++	    <widget class="GtkStatusbar" id="statusBar">
+ 	      <property name="visible">True</property>
+-	      <property name="has_progress">False</property>
+-	      <property name="has_status">True</property>
+ 	    </widget>
+ 	    <packing>
+ 	      <property name="padding">5</property>



More information about the arch-commits mailing list