[tasks] Remove libunique support
- From: Ross Burton <rburton src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tasks] Remove libunique support
- Date: Thu, 23 Feb 2012 13:37:55 +0000 (UTC)
commit ab32fd45839b55fb116373f64c6e4e5609d4fc4b
Author: Ross Burton <ross linux intel com>
Date: Mon Jul 18 17:10:07 2011 +0100
Remove libunique support
configure.ac | 9 ---------
src/gtk/Makefile.am | 6 ++----
src/gtk/main.c | 22 ++--------------------
3 files changed, 4 insertions(+), 33 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index e0b91cf..83ae875 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,15 +40,6 @@ AS_IF([test "x$with_owl" = "xyes"], [
])
AM_CONDITIONAL(WITH_OWL, test "x$with_owl" = "xyes")
-AC_ARG_WITH(unique,
- AS_HELP_STRING([--with-unique],[Enable LibUnique support]),
- ,with_unique=no)
-AS_IF([test "x$with_unique" = "xyes"], [
- PKG_CHECK_MODULES(UNIQUE, unique-1.0)
- AC_DEFINE(WITH_UNIQUE, 1, [LibUnique present])
- ])
-AM_CONDITIONAL(WITH_UNIQUE, test "$with_unique" = "xyes")
-
AC_OUTPUT([
Makefile
data/Makefile
diff --git a/src/gtk/Makefile.am b/src/gtk/Makefile.am
index 55c3ddc..7023d1c 100644
--- a/src/gtk/Makefile.am
+++ b/src/gtk/Makefile.am
@@ -7,14 +7,12 @@ tasks_CFLAGS = \
$(WARN_CFLAGS) \
$(GTK_CFLAGS) \
$(ECAL_CFLAGS) \
- $(OWL_CFLAGS) \
- $(UNIQUE_CFLAGS)
+ $(OWL_CFLAGS)
tasks_LDADD = \
$(top_builddir)/libkoto/libkoto.a \
$(GTK_LIBS) \
$(ECAL_LIBS) \
- $(OWL_LIBS) \
- $(UNIQUE_LIBS)
+ $(OWL_LIBS)
tasks_SOURCES = \
main.c \
diff --git a/src/gtk/main.c b/src/gtk/main.c
index 6c8a0f1..8848bf3 100644
--- a/src/gtk/main.c
+++ b/src/gtk/main.c
@@ -46,15 +46,6 @@
#include <owlwindowmenu.h>
#endif
-#if WITH_UNIQUE
-#include <unique/unique.h>
-
-enum {
- COMMAND_ACTIVATE = UNIQUE_ACTIVATE,
- COMMAND_EDIT = 1
-};
-#endif
-
#include "ui.h"
#include "window-util.h"
@@ -542,7 +533,7 @@ koto_platform_edit_task (KotoTask *task)
edit_task (task);
}
-#if WITH_UNIQUE
+#if 0
static UniqueResponse
do_message_received (UniqueApp *app,
gint command,
@@ -595,10 +586,6 @@ main (int argc, char **argv)
{ NULL }
};
-#if WITH_UNIQUE
- UniqueApp *app;
-#endif
-
#ifdef ENABLE_NLS
/* Initialise i18n*/
bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR);
@@ -616,7 +603,7 @@ main (int argc, char **argv)
return EXIT_FAILURE;
}
-#if WITH_UNIQUE
+#if 0
app = unique_app_new_with_commands ("org.pimlico-project.Tasks", NULL,
"edit", COMMAND_EDIT,
NULL);
@@ -674,11 +661,6 @@ main (int argc, char **argv)
window_bind_state (GTK_WINDOW (window), "main");
g_signal_connect (window, "destroy", gtk_main_quit, NULL);
-#if WITH_UNIQUE
- unique_app_watch_window (app, GTK_WINDOW (window));
- g_signal_connect (app, "message-received", G_CALLBACK (do_message_received), NULL);
-#endif
-
top_box = gtk_vbox_new (FALSE, 0);
gtk_container_add (GTK_CONTAINER (window), top_box);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]