aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2014-11-12 05:12:54 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2014-11-12 05:12:54 +0100
commitc356792c6c2827382a13bb55cac5c3d70d96ce08 (patch)
tree9953285c2f2542feb7e50201fcf4b45e826b7b35
parent4ae9e07bb3f6af341a568888f2487712d7a40829 (diff)
downloadarctica-greeter-c356792c6c2827382a13bb55cac5c3d70d96ce08.tar.gz
arctica-greeter-c356792c6c2827382a13bb55cac5c3d70d96ce08.tar.bz2
arctica-greeter-c356792c6c2827382a13bb55cac5c3d70d96ce08.zip
Apply patch 01_x2go+rls.patch. Natively support X2Go Session.
-rw-r--r--debian/changelog9
-rw-r--r--debian/patches/01_x2go+rls.patch39
-rw-r--r--debian/patches/series1
-rw-r--r--src/user-list.vala15
4 files changed, 17 insertions, 47 deletions
diff --git a/debian/changelog b/debian/changelog
index 19c1e0a..23bd405 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,7 @@
-unity-greeter (14.04.10-0ubuntu1+x2go1) trusty; urgency=medium
-
- * Non-maintainer upload.
- * Add X2Go support to RLS.
- * Turn package into format 3.0 (quilt).
- * Provide via ppa:x2go/ppa and ppa:x2go/stable on Launchpad.
+unity-greeter-x2go (14.04.10-0x2go1) trusty; urgency=medium
+ * First forked/upstream release (1.0.0.1):
+ - Apply patch 01_x2go+rls.patch. Natively support X2Go Session.
-- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Sun, 02 Nov 2014 19:12:50 +0100
diff --git a/debian/patches/01_x2go+rls.patch b/debian/patches/01_x2go+rls.patch
deleted file mode 100644
index 8b3135f..0000000
--- a/debian/patches/01_x2go+rls.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-=== modified file 'src/user-list.vala'
---- a/src/user-list.vala
-+++ b/src/user-list.vala
-@@ -20,7 +20,7 @@
-
- int remote_server_field_sort_function (RemoteServerField? item1, RemoteServerField? item2)
- {
-- string[] sorted_fields = { "domain", "username", "email", "password" };
-+ string[] sorted_fields = { "domain", "x2gosession" , "username", "email", "password"};
- foreach (var field in sorted_fields)
- {
- if (item1.type == field)
-@@ -702,6 +702,13 @@
- entry.text = default_value;
- widget = entry;
- }
-+ else if (field.type == "x2gosession")
-+ {
-+ var prompt = add_prompt (_("X2Go Session:"));
-+ prompt.text = default_value;
-+ prompt.sensitive = true;
-+ widget = prompt;
-+ }
- else if (field.type == "domain")
- {
- string[] domainsArray = {};
-@@ -1077,6 +1084,12 @@
- var answer = field != null ? field.text : "";
- UnityGreeter.singleton.respond (answer);
- }
-+ else if (text == "x2gosession:")
-+ {
-+ Gtk.Entry field = current_remote_fields.get ("x2gosession") as Gtk.Entry;
-+ var answer = field != null ? field.text : "";
-+ UnityGreeter.singleton.respond (answer);
-+ }
- }
- else
- base.show_prompt_cb (text, type);
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 36c571f..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-01_x2go+rls.patch
diff --git a/src/user-list.vala b/src/user-list.vala
index 5f2bceb..86b71d2 100644
--- a/src/user-list.vala
+++ b/src/user-list.vala
@@ -20,7 +20,7 @@
int remote_server_field_sort_function (RemoteServerField? item1, RemoteServerField? item2)
{
- string[] sorted_fields = { "domain", "username", "email", "password" };
+ string[] sorted_fields = { "domain", "x2gosession" , "username", "email", "password"};
foreach (var field in sorted_fields)
{
if (item1.type == field)
@@ -702,6 +702,13 @@ public class UserList : GreeterList
entry.text = default_value;
widget = entry;
}
+ else if (field.type == "x2gosession")
+ {
+ var prompt = add_prompt (_("X2Go Session:"));
+ prompt.text = default_value;
+ prompt.sensitive = true;
+ widget = prompt;
+ }
else if (field.type == "domain")
{
string[] domainsArray = {};
@@ -1077,6 +1084,12 @@ public class UserList : GreeterList
var answer = field != null ? field.text : "";
UnityGreeter.singleton.respond (answer);
}
+ else if (text == "x2gosession:")
+ {
+ Gtk.Entry field = current_remote_fields.get ("x2gosession") as Gtk.Entry;
+ var answer = field != null ? field.text : "";
+ UnityGreeter.singleton.respond (answer);
+ }
}
else
base.show_prompt_cb (text, type);