From 8179acd64cc1b8841dbb61584fbf6d12ce4d3060 Mon Sep 17 00:00:00 2001 From: "Hone Jen Yee (PCMan)" Date: Sun, 20 Oct 2013 18:22:44 +0800 Subject: [PATCH] Remove dependency on libgee. --- configure.ac | 4 ---- lxsession-db/Makefile.am | 1 - lxsession-db/desktop-files-backend.vala | 20 +++++++--------- lxsession/Makefile.am | 2 -- lxsession/app.vala | 32 ++++++++++++------------- lxsession/autostart.vala | 17 +++++++------ 6 files changed, 33 insertions(+), 43 deletions(-) diff --git a/configure.ac b/configure.ac index f267f00..c756268 100644 --- a/configure.ac +++ b/configure.ac @@ -72,10 +72,6 @@ PKG_CHECK_MODULES(GIO, [gio-unix-2.0]) AC_SUBST(GIO_CFLAGS) AC_SUBST(GIO_LIBS) -PKG_CHECK_MODULES(GEE, [gee-0.8]) -AC_SUBST(GEE_CFLAGS) -AC_SUBST(GEE_LIBS) - PKG_CHECK_MODULES(DBUSGLIB, [dbus-glib-1]) AC_SUBST(DBUSGLIB_CFLAGS) AC_SUBST(DBUSGLIB_LIBS) diff --git a/lxsession-db/Makefile.am b/lxsession-db/Makefile.am index ac89773..2c08e9c 100644 --- a/lxsession-db/Makefile.am +++ b/lxsession-db/Makefile.am @@ -8,7 +8,6 @@ lxsession_db_SOURCES = \ lxsession_db_VALAFLAGS = \ --vapidir=$(srcdir)/../vapi \ --pkg gtk+-2.0 \ - --pkg gee-0.8 \ $(NULL) lxsession_db_CFLAGS = \ diff --git a/lxsession-db/desktop-files-backend.vala b/lxsession-db/desktop-files-backend.vala index f7ef905..f926a7b 100644 --- a/lxsession-db/desktop-files-backend.vala +++ b/lxsession-db/desktop-files-backend.vala @@ -15,8 +15,6 @@ along with this program. If not, see . */ -using Gee; - namespace Lxsession { [DBus(name = "org.lxde.SessionManager")] @@ -36,12 +34,12 @@ namespace Lxsession public class DBDefaultApps: GLib.Object { - public ArrayList webbrowser_installed = new ArrayList (); - public ArrayList webbrowser_available = new ArrayList (); + public List webbrowser_installed = new List (); + public List webbrowser_available = new List (); public string webbrowser_installed_blacklist; - public ArrayList email_installed = new ArrayList (); - public ArrayList email_available = new ArrayList (); + public List email_installed = new List (); + public List email_available = new List (); public string email_installed_blacklist; public signal void finish_scanning_installed(); @@ -245,7 +243,7 @@ namespace Lxsession /* TODO Make a genereic find_ function ? */ - private void find_webbrowser_list(KeyFile kf, string desktop_path, string name, ArrayList list) + private void find_webbrowser_list(KeyFile kf, string desktop_path, string name, List list) { try { @@ -260,7 +258,7 @@ namespace Lxsession { if ("WebBrowser" in categories) { - list.add (name); + list.append (name); } } } @@ -271,7 +269,7 @@ namespace Lxsession } } - private void find_email_list(KeyFile kf, string desktop_path, string name, ArrayList list) + private void find_email_list(KeyFile kf, string desktop_path, string name, List list) { try { @@ -286,7 +284,7 @@ namespace Lxsession { if ("Email" in categories) { - list.add (name); + list.append (name); } } } @@ -297,7 +295,7 @@ namespace Lxsession } } - public string[] string_array_list_to_array (ArrayList list) + public string[] string_array_list_to_array (List list) { string tmp_string = null; string[] array_save; diff --git a/lxsession/Makefile.am b/lxsession/Makefile.am index 0af5716..b118848 100644 --- a/lxsession/Makefile.am +++ b/lxsession/Makefile.am @@ -28,7 +28,6 @@ buildinpolkit_SOURCES = \ buildinpolkit_VALAFLAGS = \ --pkg lxpolkit \ - --pkg gtk+-2.0 \ -D BUILDIN_POLKIT \ $(NULL) @@ -70,7 +69,6 @@ lxsession_VALAFLAGS = \ --vapidir=$(srcdir)/../vapi \ --pkg dbus-glib-1 \ --pkg gio-2.0 \ - --pkg gee-0.8 \ --pkg posix \ --pkg lxsettings-daemon \ --pkg xdg-autostart \ diff --git a/lxsession/app.vala b/lxsession/app.vala index 3804286..76c5c83 100644 --- a/lxsession/app.vala +++ b/lxsession/app.vala @@ -21,7 +21,6 @@ TODO packagekit handler (GUI and stuff) ? TODO Use wnck for managing launching applications ? */ -using Gee; using Posix; namespace Lxsession @@ -295,28 +294,29 @@ public class WindowsManagerApp: SimpleAppObject private string find_window_manager() { - var wm_list = new ArrayList (); + var wm_list = new Array (); - wm_list.add("openbox-lxde"); - wm_list.add("openbox-lubuntu"); - wm_list.add("openbox"); - wm_list.add("compiz"); - wm_list.add("kwin"); - wm_list.add("mutter"); - wm_list.add("fluxbox"); - wm_list.add("metacity"); - wm_list.add("xfwin"); - wm_list.add("matchbox"); + wm_list.append_val("openbox-lxde"); + wm_list.append_val("openbox-lubuntu"); + wm_list.append_val("openbox"); + wm_list.append_val("compiz"); + wm_list.append_val("kwin"); + wm_list.append_val("mutter"); + wm_list.append_val("fluxbox"); + wm_list.append_val("metacity"); + wm_list.append_val("xfwin"); + wm_list.append_val("matchbox"); string return_value = ""; - foreach (string i in wm_list) + for(int i = 0; i < wm_list.length; ++i) { - string test_wm = Environment.find_program_in_path(i); + unowned string wm = wm_list.index(i); + string test_wm = Environment.find_program_in_path(wm); if ( test_wm != null) { - message ("Finding %s",i); - return_value = i; + message ("Finding %s",wm); + return_value = wm; break; } } diff --git a/lxsession/autostart.vala b/lxsession/autostart.vala index 1940c31..ebbc5ed 100644 --- a/lxsession/autostart.vala +++ b/lxsession/autostart.vala @@ -17,17 +17,15 @@ * MA 02110-1301, USA. */ -using Gee; - namespace Lxsession { public class LxsessionAutostartConfig: GLib.Object { - private ArrayList stock_list ; + private Array stock_list ; public LxsessionAutostartConfig() { - /* Copy the ArrayList, can't be modify inside constructor */ + /* Copy the Array, can't be modify inside constructor */ stock_list = load_autostart_file(); /* foreach (AppType s in stock_list) { @@ -36,10 +34,10 @@ public class LxsessionAutostartConfig: GLib.Object { */ } - public ArrayList load_autostart_file() { + public Array load_autostart_file() { var file = File.new_for_path (get_config_path ("autostart")); - var app_list = new ArrayList (); + var app_list = new Array (); message ("Autostart path : %s", file.get_path()); @@ -61,7 +59,7 @@ public class LxsessionAutostartConfig: GLib.Object { builder.erase(0,1); string[] command = builder.str.split_set(" ",0); AppType app = { command[0], command, true, "" }; - app_list.add (app); + app_list.append_val (app); break; case ("#"): /* Commented, skip */ @@ -69,7 +67,7 @@ public class LxsessionAutostartConfig: GLib.Object { default: string[] command = line.split_set(" ",0); AppType app = { command[0], command, false, "" }; - app_list.add (app); + app_list.append_val (app); break; } } @@ -85,7 +83,8 @@ public class LxsessionAutostartConfig: GLib.Object { public void start_applications() { - foreach (AppType s in stock_list) { + for (int i = 0; i < stock_list.length; ++i) { + unowned AppType s = stock_list.index(i); var launch_app = new GenericAppObject(s); launch_app.launch(); }