=?utf-8?q?=5Btasque=5D_Applied_Gy=C3=B6rgy_Ball=C3=B3=27s_patches=2E_Fixe?= =?utf-8?q?s_for_=23670391=2C_=23671553?=
- From: Antonius Riha <antoniusri src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tasque] Applied GyÃrgy BallÃ's patches. Fixes for #670391, #671553
- Date: Wed, 5 Sep 2012 21:39:20 +0000 (UTC)
commit 1a069e6efe40e1540fd64053a5e0b1da0ff055ad
Author: Antonius Riha <antoniusriha gmail com>
Date: Wed Sep 5 23:38:39 2012 +0200
Applied GyÃrgy BallÃ's patches. Fixes for #670391, #671553
* Removed gconf-sharp and gnome dependencies
* Use dbus-sharp instead of NDesk.DBus.
configure.ac | 11 ++---------
src/Backends/IceCore/IceBackend.cs | 2 +-
src/Backends/IceCore/Makefile.am | 6 +++---
src/GnomeApplication.cs | 14 +++++++-------
src/Makefile.am | 6 +++---
src/RemoteControl.cs | 2 +-
src/RemoteControlProxy.cs | 2 +-
7 files changed, 18 insertions(+), 25 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 192bfa6..6b95186 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,19 +30,12 @@ AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package])
AM_GLIB_GNU_GETTEXT
-#
-# Find gconftool-2
-#
-AC_PATH_PROG(GCONFTOOL, gconftool-2)
-AM_GCONF_SOURCE_2
-
PKG_CHECK_MODULES([GLIB_SHARP_20], [glib-sharp-2.0])
-PKG_CHECK_MODULES([GNOME_SHARP_20], [gnome-sharp-2.0])
PKG_CHECK_MODULES([GTK_SHARP_20], [gtk-sharp-2.0 >= 2.10.0])
PKG_CHECK_MODULES([GTK_SHARP_2_12], gtk-sharp-2.0 >= 2.12.0, GTK_2_12="yes", GTK_2_12="no")
AM_CONDITIONAL(GTK_2_12, test "$GTK_2_12" = "yes")
-PKG_CHECK_MODULES([NDESK_DBUS_10], [ndesk-dbus-1.0])
-PKG_CHECK_MODULES([NDESK_DBUS_GLIB_10], [ndesk-dbus-glib-1.0])
+PKG_CHECK_MODULES([DBUS_SHARP_10], [dbus-sharp-1.0])
+PKG_CHECK_MODULES([DBUS_SHARP_GLIB_10], [dbus-sharp-glib-1.0])
#
# Allow the project to build without notify-sharp
diff --git a/src/Backends/IceCore/IceBackend.cs b/src/Backends/IceCore/IceBackend.cs
index f83b168..6b44e30 100644
--- a/src/Backends/IceCore/IceBackend.cs
+++ b/src/Backends/IceCore/IceBackend.cs
@@ -3,7 +3,7 @@
using System;
using System.Collections.Generic;
-using NDesk.DBus;
+using DBus;
using org.freedesktop.DBus;
using Novell.IceDesktop;
using Tasque;
diff --git a/src/Backends/IceCore/Makefile.am b/src/Backends/IceCore/Makefile.am
index 68bbad9..c0a7c4e 100644
--- a/src/Backends/IceCore/Makefile.am
+++ b/src/Backends/IceCore/Makefile.am
@@ -8,10 +8,10 @@ CSFLAGS = \
ASSMS = \
-r:$(top_builddir)/src/Tasque.exe \
$(GLIB_SHARP_20_LIBS) \
- $(GNOME_SHARP_20_LIBS) \
+ $(GTK_SHARP_20_LIBS) \
$(ICE_DESKTOP_LIBS) \
- $(NDESK_DBUS_10_LIBS) \
- $(NDESK_DBUS_GLIB_10_LIBS) \
+ $(DBUS_SHARP_10_LIBS) \
+ $(DBUS_SHARP_GLIB_10_LIBS) \
-r:System \
-r:Mono.Posix
-r:System.xml
diff --git a/src/GnomeApplication.cs b/src/GnomeApplication.cs
index 96b56e2..db168f7 100644
--- a/src/GnomeApplication.cs
+++ b/src/GnomeApplication.cs
@@ -7,12 +7,12 @@ using System.Xml;
using Mono.Unix;
using Mono.Unix.Native;
+using System.Diagnostics;
namespace Tasque
{
public class GnomeApplication : INativeApplication
{
- private Gnome.Program program;
private string confDir;
public GnomeApplication ()
@@ -36,10 +36,6 @@ namespace Tasque
} catch {} // Ignore exception if fail (not needed to run)
Gtk.Application.Init ();
- program = new Gnome.Program (display_name,
- Defines.Version,
- Gnome.Modules.UI,
- args);
}
public void InitializeIdle ()
@@ -56,7 +52,7 @@ namespace Tasque
public void StartMainLoop ()
{
- program.Run ();
+ Gtk.Application.Run ();
}
public void QuitMainLoop ()
@@ -95,7 +91,11 @@ namespace Tasque
public void OpenUrl (string url)
{
- Gnome.Url.Show (url);
+ try {
+ Process.Start (url);
+ } catch (Exception e) {
+ Logger.Error ("Error opening url [{0}]:\n{1}", url, e.ToString ());
+ }
}
public string ConfDir {
diff --git a/src/Makefile.am b/src/Makefile.am
index 22ee429..dd105e1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -162,10 +162,10 @@ ASSEMBLIES = \
-r:System.Xml \
-r:$(top_builddir)/RtmNet/RtmNet \
$(GLIB_SHARP_20_LIBS) \
- $(GNOME_SHARP_20_LIBS) \
+ $(GTK_SHARP_20_LIBS) \
$(NOTIFY_SHARP_LIBS) \
- $(NDESK_DBUS_10_LIBS) \
- $(NDESK_DBUS_GLIB_10_LIBS) \
+ $(DBUS_SHARP_10_LIBS) \
+ $(DBUS_SHARP_GLIB_10_LIBS) \
$(ICE_DESKTOP_LIBS) \
$(SQLITE_LIBS) \
$(EVOLUTION_SHARP_LIBS) \
diff --git a/src/RemoteControl.cs b/src/RemoteControl.cs
index 54cf313..201a086 100644
--- a/src/RemoteControl.cs
+++ b/src/RemoteControl.cs
@@ -14,7 +14,7 @@ using Notifications;
#endif
using org.freedesktop.DBus;
-using NDesk.DBus;
+using DBus;
namespace Tasque
{
diff --git a/src/RemoteControlProxy.cs b/src/RemoteControlProxy.cs
index 862d1fc..b5adbd4 100644
--- a/src/RemoteControlProxy.cs
+++ b/src/RemoteControlProxy.cs
@@ -1,5 +1,5 @@
using System;
-using NDesk.DBus;
+using DBus;
using org.freedesktop.DBus;
namespace Tasque
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]