[vino] Remove preferences dialog, bug 700070

[David King <davidk src gnome org>]

commit 328b2e46aef14b4204d3c20e0de40bd0a69b4229
Author: David King <amigadave amigadave com>
Date:   Fri May 10 14:54:46 2013 +0100

    Remove preferences dialog, bug 700070

 Makefile.am                                        |   44 +--
 capplet/org.gnome.vino.Service.php                 |  116 -----
 capplet/vino-connectivity-info.c                   |  374 ---------------
 capplet/vino-connectivity-info.h                   |   33 --
 capplet/vino-message-box.c                         |  156 ------
 capplet/vino-message-box.h                         |   59 ---
 capplet/vino-preferences.c                         |  504 --------------------
 capplet/vino-preferences.desktop.in.in             |   14 -
 capplet/vino-preferences.ui                        |  449 -----------------
 capplet/vino-radio-button.c                        |  181 -------
 capplet/vino-url-webservice.c                      |   73 ---
 capplet/vino-url-webservice.h                      |   29 --
 capplet/webservices                                |   28 --
 capplet/vino-radio-button.h => common/vino-enums.h |   21 +-
 common/vino-keyring.c                              |   77 ---
 configure.ac                                       |    1 -
 po/POTFILES.in                                     |    5 -
 17 files changed, 15 insertions(+), 2149 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index b95b8a4..542396b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,7 @@ SUBDIRS = po
 DISTCHECK_CONFIGURE_FLAGS = \
        --with-avahi \
        --with-libnotify \
-       --with-gnome-keyring \
+       --with-secret \
        --with-network-manager \
        --with-telepathy \
        --with-gnutls \
@@ -241,38 +241,8 @@ server/org.freedesktop.Telepathy.Client.Vino.service: server/org.freedesktop.Tel
        $(AM_V_GEN)$(SED) -e "s|[ ]libexecdir[@]|$(libexecdir)|" $< > $@
 
 bin_PROGRAMS = \
-       vino-preferences \
        vino-passwd
 
-vino_preferences_CPPFLAGS = \
-       -I$(top_srcdir)/common \
-       -I$(top_builddir) \
-       -DVINO_LOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"  \
-       -DVINO_UIDIR=\""$(pkgdatadir)"\" \
-       -DVINO_ICONDIR=\""$(datadir)/pixmaps\"" \
-       $(VINO_CAPPLET_CFLAGS) \
-       $(WARN_CFLAGS) \
-       $(DISABLE_DEPRECATED)
-
-vino_preferences_SOURCES = \
-       common/vino-dbus.h \
-       common/vino-dbus.c \
-       common/vino-keyring.h \
-       common/vino-keyring.c \
-       capplet/vino-connectivity-info.h \
-       capplet/vino-connectivity-info.c \
-       capplet/vino-url-webservice.h \
-       capplet/vino-url-webservice.c \
-       capplet/vino-radio-button.h \
-       capplet/vino-radio-button.c \
-       capplet/vino-message-box.h \
-       capplet/vino-message-box.c \
-       capplet/vino-preferences.c
-
-vino_preferences_LDADD = \
-       $(VINO_CAPPLET_LIBS) \
-       $(X_LIBS)
-
 vino_passwd_CPPFLAGS = \
        -I$(top_builddir) \
        -DVINO_LOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
@@ -286,24 +256,15 @@ vino_passwd_SOURCES = \
 vino_passwd_LDADD = \
        $(VINO_TOOLS_LIBS)
 
-uidir = $(pkgdatadir)
-dist_ui_DATA = \
-       capplet/vino-preferences.ui \
-       capplet/webservices
-
 autostartdir = $(sysconfdir)/xdg/autostart
 autostart_in_files = server/vino-server.desktop.in
 nodist_autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
 
-desktopdir = $(datadir)/applications
-desktop_in_files = capplet/vino-preferences.desktop.in
-nodist_desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-
 @INTLTOOL_DESKTOP_RULE@
 
 # GSettings schemas, enum files and conversion file
 gsettings_ENUM_NAMESPACE = org.gnome.Vino
-gsettings_ENUM_FILES = capplet/vino-preferences.c
+gsettings_ENUM_FILES = common/vino-enums.h
 gsettings_SCHEMAS = common/org.gnome.Vino.gschema.xml
 
 @GSETTINGS_RULES@
@@ -330,6 +291,7 @@ dist-changelog:
 dist_noinst_DATA = \
        $(desktop_in_files) \
        \
+       $(gsettings_ENUM_FILES) \
        $(gsettings_SCHEMAS) \
        \
        docs/remote-desktop.txt \
diff --git a/capplet/vino-radio-button.h b/common/vino-enums.h
similarity index 67%
rename from capplet/vino-radio-button.h
rename to common/vino-enums.h
index cf1c18e..be5acf5 100644
--- a/capplet/vino-radio-button.h
+++ b/common/vino-enums.h
@@ -1,4 +1,6 @@
 /*
+ * Copyright (C) 2003 Sun Microsystems, Inc.
+ * Copyright (C) 2006 Jonh Wendell <wendell bani com br> 
  * Copyright © 2010 Codethink Limited
  *
  * This program is free software; you can redistribute it and/or
@@ -16,14 +18,15 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
  * 02111-1307, USA.
  *
- * Author: Ryan Lortie <desrt desrt ca>
+ * Authors:
+ *      Mark McLoughlin <mark skynet ie>
+ *      Jonh Wendell <wendell bani com br>
+ *      Ryan Lortie <desrt desrt ca>
  */
 
-#ifndef __vino_radio_button_h__
-#define __vino_radio_button_h__
-
-#include <glib-object.h>
-
-GType vino_radio_button_get_type (void);
-
-#endif /* __vino_radio_button_h__ */
+typedef enum
+{
+  VINO_ICON_VISIBILITY_NEVER,
+  VINO_ICON_VISIBILITY_ALWAYS,
+  VINO_ICON_VISIBILITY_CLIENT
+} VinoIconVisibility;
diff --git a/configure.ac b/configure.ac
index 4c87283..a00477a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -315,7 +315,6 @@ GLIB_GSETTINGS
 
 AC_CONFIG_FILES([
 Makefile
-capplet/vino-preferences.desktop.in
 po/Makefile.in
 ])
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index ee33014..e941c15 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,11 +1,6 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
-capplet/vino-message-box.c
-capplet/vino-preferences.c
-capplet/vino-preferences.desktop.in.in
-[type: gettext/glade]capplet/vino-preferences.ui
 common/org.gnome.Vino.gschema.xml
-common/vino-keyring.c
 server/smclient/eggdesktopfile.c
 server/smclient/eggsmclient.c
 server/vino-dbus-listener.c