aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--configure.ac11
-rw-r--r--debian/control14
-rw-r--r--src/arctica-greeter.vala2
-rw-r--r--src/config.vapi2
-rw-r--r--src/indicator.vapi21
-rw-r--r--src/menubar.vala88
-rw-r--r--src/settings-daemon.vala6
7 files changed, 75 insertions, 69 deletions
diff --git a/configure.ac b/configure.ac
index a5f34e3..86ddaef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,11 +17,12 @@ dnl ###########################################################################
dnl Dependencies
dnl ###########################################################################
+
+dnl #### removed from PKG_CHECK_MODULES: libido3-0.
PKG_CHECK_MODULES(ARCTICA_GREETER, [
gtk+-3.0
gdk-x11-3.0
indicator3-0.4
- libido3-0.1 >= 13.10.0
liblightdm-gobject-1 >= 1.4.0
gnome-desktop-3.0
freetype2
@@ -36,11 +37,11 @@ AC_DEFINE_UNQUOTED([INDICATOR_FILE_DIR], ["${prefix}/share/unity/indicators"], [
INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3-0.4`
AC_SUBST(INDICATORDIR)
-USD_BINARY=`$PKG_CONFIG --variable=binary unity-settings-daemon`
-if test -z "$USD_BINARY"; then
- AC_MSG_ERROR([Could not find path to unity-settings-daemon binary])
+MSD_BINARY=`$PKG_CONFIG --variable=binary mate-settings-daemon`
+if test -z "$MSD_BINARY"; then
+ AC_MSG_ERROR([Could not find path to mate-settings-daemon binary])
fi
-AC_DEFINE_UNQUOTED([USD_BINARY], ["$USD_BINARY"], [Path to g-s-d])
+AC_DEFINE_UNQUOTED([MSD_BINARY], ["$MSD_BINARY"], [Path to m-s-d])
dnl ###########################################################################
dnl Internationalization
diff --git a/debian/control b/debian/control
index 3733920..4e757d6 100644
--- a/debian/control
+++ b/debian/control
@@ -3,23 +3,23 @@ Section: x11
Priority: optional
Maintainer: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Standards-Version: 3.9.6
-Build-Depends: appmenu-gtk3,
- at-spi2-core,
+Build-Depends: at-spi2-core,
dbus-x11,
debhelper (>= 9),
dh-autoreconf,
gnome-common,
- ttf-ubuntu-font-family,
- unity-settings-daemon-dev,
+ gnome-icon-theme,
+ mate-settings-daemon-dev,
libcanberra-dev,
libgnome-desktop-3-dev,
libgtk-3-dev,
libindicator3-dev,
- libido3-0.1-dev (>= 13.10.0),
- liblightdm-gobject-1-dev (>= 1.4.0),
+ liblightdm-gobject-dev (>= 1.4.0),
+ lightdm-vala,
libpixman-1-dev,
valac (>= 0.20.0),
xvfb,
+ xauth,
Homepage: http://arctica-project.org
Vcs-Git: git://cgit.arctica-project.org/arctica-greeter.git
Vcs-Browser: https://cgit.arctica-project.org/arctica-greeter.git/
@@ -30,7 +30,7 @@ Depends: ${misc:Depends},
${shlibs:Depends},
lightdm,
network-manager,
-Recommends: unity-settings-daemon,
+Recommends: mate-settings-daemon,
indicator-application,
indicator-datetime,
indicator-keyboard,
diff --git a/src/arctica-greeter.vala b/src/arctica-greeter.vala
index 217e23c..eb827b8 100644
--- a/src/arctica-greeter.vala
+++ b/src/arctica-greeter.vala
@@ -488,7 +488,7 @@ public class ArcticaGreeter
}
Gtk.init (ref args);
- Ido.init ();
+ // Ido.init ();
log_timer = new Timer ();
Log.set_default_handler (log_cb);
diff --git a/src/config.vapi b/src/config.vapi
index 8fe2441..c1bcac2 100644
--- a/src/config.vapi
+++ b/src/config.vapi
@@ -8,5 +8,5 @@ namespace Config
public const string INDICATOR_FILE_DIR;
public const string PKGDATADIR;
public const string INDICATORDIR;
- public const string USD_BINARY;
+ public const string MSD_BINARY;
}
diff --git a/src/indicator.vapi b/src/indicator.vapi
index 9b28c72..358d0a7 100644
--- a/src/indicator.vapi
+++ b/src/indicator.vapi
@@ -36,7 +36,7 @@ namespace Indicator {
[NoWrapper]
public virtual unowned string get_name_hint ();
public virtual bool get_show_now (Indicator.ObjectEntry entry);
- public virtual int get_position ();
+// public virtual int get_position ();
[NoWrapper]
public virtual void reserved1 ();
[NoWrapper]
@@ -56,11 +56,12 @@ namespace Indicator {
public virtual signal void menu_show (Indicator.ObjectEntry entry, uint timestamp);
public virtual signal void show_now_changed (Indicator.ObjectEntry entry, bool show_now_state);
}
- [CCode (cheader_filename = "libindicator/indicator-ng.h")]
- public class Ng : Object {
- [CCode (has_construct_function = false)]
- public Ng.for_profile (string filename, string profile) throws GLib.Error;
- }
+
+// [CCode (cheader_filename = "libindicator/indicator-ng.h")]
+// public class Ng : Object {
+// [CCode (has_construct_function = false)]
+// public Ng.for_profile (string filename, string profile) throws GLib.Error;
+// }
[Compact]
[CCode (cheader_filename = "gtk/gtk.h,libindicator/indicator.h,libindicator/indicator-desktop-shortcuts.h,libindicator/indicator-image-helper.h,libindicator/indicator-object.h,libindicator/indicator-service.h,libindicator/indicator-service-manager.h")]
public class ObjectEntry {
@@ -159,7 +160,7 @@ namespace Indicator {
public static void image_helper_update (Gtk.Image image, string name);
}
-[CCode (cheader_filename="libido/libido.h", lower_case_cprefix = "ido_")]
-namespace Ido {
- public void init ();
-}
+//[CCode (cheader_filename="libido/libido.h", lower_case_cprefix = "ido_")]
+//namespace Ido {
+// public void init ();
+//}
diff --git a/src/menubar.vala b/src/menubar.vala
index 799cb18..128be17 100644
--- a/src/menubar.vala
+++ b/src/menubar.vala
@@ -237,35 +237,36 @@ public class MenuBar : Gtk.MenuBar
return a11y_item;
}
- private Indicator.Object? load_indicator_file (string indicator_name)
- {
- string dir = Config.INDICATOR_FILE_DIR;
- string path;
- Indicator.Object io;
-
- /* To stay backwards compatible, use com.canonical.indicator as the default prefix */
- if (indicator_name.index_of_char ('.') < 0)
- path = @"$dir/com.canonical.indicator.$indicator_name";
- else
- path = @"$dir/$indicator_name";
-
- try
- {
- io = new Indicator.Ng.for_profile (path, "desktop_greeter");
- }
- catch (FileError error)
- {
- /* the calling code handles file-not-found; don't warn here */
- return null;
- }
- catch (Error error)
- {
- warning ("unable to load %s: %s", indicator_name, error.message);
- return null;
- }
-
- return io;
- }
+ //private Indicator.Object? load_indicator_file (string indicator_name)
+ //{
+
+ // string dir = Config.INDICATOR_FILE_DIR;
+ // string path;
+ // Indicator.Object io;
+
+ // /* To stay backwards compatible, use com.canonical.indicator as the default prefix */
+ // if (indicator_name.index_of_char ('.') < 0)
+ // path = @"$dir/com.canonical.indicator.$indicator_name";
+ // else
+ // path = @"$dir/$indicator_name";
+
+ // try
+ // {
+ // io = new Indicator.Ng.for_profile (path, "desktop_greeter");
+ // }
+ // catch (FileError error)
+ // {
+ // /* the calling code handles file-not-found; don't warn here */
+ // return null;
+ // }
+ // catch (Error error)
+ // {
+ // warning ("unable to load %s: %s", indicator_name, error.message);
+ // return null;
+ // }
+
+ // return io;
+ //}
private Indicator.Object? load_indicator_library (string indicator_name)
{
@@ -293,10 +294,13 @@ public class MenuBar : Gtk.MenuBar
}
else
{
- var io = load_indicator_file (indicator_name);
+ // var io = load_indicator_file (indicator_name);
+
+ // if (io == null)
+ // io = load_indicator_library (indicator_name);
- if (io == null)
- io = load_indicator_library (indicator_name);
+ // Use the below line of code instead...
+ var io = load_indicator_library (indicator_name);
if (io != null)
{
@@ -318,7 +322,7 @@ public class MenuBar : Gtk.MenuBar
greeter_set_env ("GIO_USE_VFS", "local");
greeter_set_env ("GVFS_DISABLE_FUSE", "1");
- /* Hint to have unity-settings-daemon run in greeter mode */
+ /* Hint to have mate-settings-daemon run in greeter mode */
greeter_set_env ("RUNNING_UNDER_GDM", "1");
/* Let indicators know about our unique dbus name */
@@ -352,17 +356,17 @@ public class MenuBar : Gtk.MenuBar
foreach (var indicator in indicator_list)
load_indicator(indicator);
- indicator_objects.sort((a, b) => {
- int pos_a = a.get_position ();
- int pos_b = b.get_position ();
+ // indicator_objects.sort((a, b) => {
+ // int pos_a = a.get_position ();
+ // int pos_b = b.get_position ();
- if (pos_a < 0)
- pos_a = 1000;
- if (pos_b < 0)
- pos_b = 1000;
+ // if (pos_a < 0)
+ // pos_a = 1000;
+ // if (pos_b < 0)
+ // pos_b = 1000;
- return pos_a - pos_b;
- });
+ // return pos_a - pos_b;
+ // });
debug ("LANG=%s LANGUAGE=%s", Environment.get_variable ("LANG"), Environment.get_variable ("LANGUAGE"));
}
diff --git a/src/settings-daemon.vala b/src/settings-daemon.vala
index 65440e8..6166b25 100644
--- a/src/settings-daemon.vala
+++ b/src/settings-daemon.vala
@@ -156,15 +156,15 @@ public class SettingsDaemon : Object
if (n_names != 0)
return;
- debug ("All bus names acquired, starting unity-settings-daemon");
+ debug ("All bus names acquired, starting mate-settings-daemon");
try
{
- Process.spawn_command_line_async (Config.USD_BINARY);
+ Process.spawn_command_line_async (Config.MSD_BINARY);
}
catch (SpawnError e)
{
- debug ("Could not start unity-settings-daemon: %s", e.message);
+ debug ("Could not start mate-settings-daemon: %s", e.message);
}
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 22:51:55 +0000