Merge lp:~noskcaj/ubuntu/vivid/gnome-system-tools/merge into lp:ubuntu/vivid/gnome-system-tools

[Jackson Doak]

Merge from debian

[Martin Pitt (pitti)]

This drops 12_fix_exit.patch from debian/patches/series, which certainly isn't intended? This looks like a bug in Debian's package.

I uploaded this with putting back the above. Thanks!

review: Approve

=== removed directory '.pc/01_wait_for_backends.patch'
=== removed directory '.pc/01_wait_for_backends.patch/src'
=== removed directory '.pc/01_wait_for_backends.patch/src/common'
=== removed file '.pc/01_wait_for_backends.patch/src/common/gst-tool.c'
--- .pc/01_wait_for_backends.patch/src/common/gst-tool.c	2011-12-16 17:08:20 +0000
+++ .pc/01_wait_for_backends.patch/src/common/gst-tool.c	1970-01-01 00:00:00 +0000
@@ -1,718 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * Copyright (C) 2001 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- *
- * Authors: Jacob Berkman         <[e-mail]>
- *          Hans Petter Jansson   <[e-mail]>
- *          Carlos Garnacho Parro <[e-mail]>
- */
-
-#include <config.h>
-#include <glib.h>
-#include <glib/gi18n.h>
-#include <time.h>
-
-#include <stdlib.h>
-
-#include <string.h>
-#include "gst-tool.h"
-#include "gst-dialog.h"
-#include "gst-platform-dialog.h"
-
-enum {
-	PLATFORM_LIST_COL_LOGO,
-	PLATFORM_LIST_COL_NAME,
-	PLATFORM_LIST_COL_ID,
-	PLATFORM_LIST_COL_LAST
-};
-
-enum {
-	OPERATION_COMMIT,
-	OPERATION_UPDATE
-};
-
-static void  gst_tool_class_init   (GstToolClass *class);
-static void  gst_tool_init         (GstTool      *tool);
-static void  gst_tool_finalize     (GObject      *object);
-
-static GObject* gst_tool_constructor (GType                  type,
-				      guint                  n_construct_properties,
-				      GObjectConstructParam *construct_params);
-static void  gst_tool_set_property (GObject      *object,
-				    guint         prop_id,
-				    const GValue *value,
-				    GParamSpec   *pspec);
-
-static void gst_tool_impl_close    (GstTool *tool);
-
-enum {
-	PROP_0,
-	PROP_NAME,
-	PROP_TITLE,
-	PROP_ICON,
-	PROP_SHOW_LOCK_BUTTON
-};
-
-typedef struct _GstAsyncData {
-	GstTool *tool;
-	OobsObjectAsyncFunc func;
-	gpointer data;
-} GstAsyncData;
-
-G_DEFINE_ABSTRACT_TYPE (GstTool, gst_tool, G_TYPE_OBJECT);
-
-static void
-gst_tool_class_init (GstToolClass *class)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (class);
-
-	object_class->set_property = gst_tool_set_property;
-	object_class->constructor  = gst_tool_constructor;
-	object_class->finalize     = gst_tool_finalize;
-
-	class->close = gst_tool_impl_close;
-	class->update_gui = NULL;
-	class->update_config = NULL;
-
-	g_object_class_install_property (object_class,
-					 PROP_NAME,
-					 g_param_spec_string ("name",
-							      "name",
-							      "Tool name",
-							      NULL,
-							      G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
-	g_object_class_install_property (object_class,
-					 PROP_TITLE,
-					 g_param_spec_string ("title",
-							      "title",
-							      "Tool title",
-							      NULL,
-							      G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
-	g_object_class_install_property (object_class,
-					 PROP_ICON,
-					 g_param_spec_string ("icon",
-							      "icon",
-							      "Tool icon",
-							      NULL,
-							      G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
-
-	g_object_class_install_property (object_class,
-					 PROP_SHOW_LOCK_BUTTON,
-					 g_param_spec_boolean ("show_lock_button",
-					                       "Show lock button",
-					                       "Whether to show lock button",
-					                       TRUE,
-					                       G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
-}
-
-static gboolean
-report_window_close_cb (GtkWidget *widget, GdkEventAny *event, gpointer data)
-{
-	gtk_widget_hide (widget);
-	return TRUE;
-}
-
-static GtkBuilder *
-gst_tool_load_common_ui (GstTool *tool)
-{
-	GtkBuilder *builder;
-
-	g_return_val_if_fail (tool != NULL, NULL);
-	g_return_val_if_fail (GST_IS_TOOL (tool), NULL);
-	g_return_val_if_fail (tool->common_ui_path != NULL, NULL);
-
-	builder = gtk_builder_new ();
-
-	if (!gtk_builder_add_from_file (builder, tool->common_ui_path, NULL)) {
-		g_error ("Could not load %s\n", tool->common_ui_path);
-	}
-
-	return builder;
-}
-
-static void
-gst_tool_init (GstTool *tool)
-{
-	GdkPixbuf  *pixbuf;
-	GtkBuilder *builder;
-
-	tool->icon_theme = gtk_icon_theme_get_default ();
-	tool->common_ui_path  = INTERFACES_DIR "/common.ui";
-
-	tool->session = oobs_session_get ();
-
-	builder = gst_tool_load_common_ui (tool);
-
-	tool->report_window = GTK_WIDGET (gtk_builder_get_object (builder, "report_window"));
-	tool->report_label = GTK_WIDGET (gtk_builder_get_object (builder, "report_label"));
-	tool->report_progress = GTK_WIDGET (gtk_builder_get_object (builder, "report_progress"));
-	tool->report_pixmap = GTK_WIDGET (gtk_builder_get_object (builder, "report_pixmap"));
-	g_signal_connect (G_OBJECT (tool->report_window), "delete_event",
-			  G_CALLBACK (report_window_close_cb), tool);
-
-	pixbuf = gtk_icon_theme_load_icon (tool->icon_theme, "gnome-system-config", 48, 0, NULL);
-	gtk_image_set_from_pixbuf (GTK_IMAGE (tool->report_pixmap), pixbuf);
-
-	if (pixbuf)
-		g_object_unref (pixbuf);
-
-	tool->objects = g_ptr_array_new ();
-
-	g_object_unref (builder);
-}
-
-/* Handle all oobs errors but OOBS_RESULT_NO_PLATFORM, which should only happen on start */
-static void
-show_oobs_error_dialog (GstTool   *tool,
-			int        operation,
-			OobsResult result)
-{
-	GtkWidget *dialog;
-	const gchar *primary_text, *secondary_text;
-
-	if (operation == OPERATION_UPDATE)
-		primary_text = N_("The configuration could not be loaded");
-	else /* OPERATION_COMMIT */
-		primary_text = N_("The configuration could not be saved");
-
-	if (result == OOBS_RESULT_ACCESS_DENIED) {
-		if (operation == OPERATION_UPDATE)
-			secondary_text = N_("You are not allowed to access the system configuration.");
-		else /* OPERATION_COMMIT */
-			secondary_text = N_("You are not allowed to modify the system configuration.");
-	}
-	else if (result == OOBS_RESULT_MALFORMED_DATA)
-		secondary_text = N_("Invalid data was found.");
-	else /* OOBS_RESULT_ERROR */
-		secondary_text = N_("An unknown error occurred.");
-
-	dialog = gtk_message_dialog_new (GTK_WINDOW (tool->main_dialog),
-					 GTK_DIALOG_MODAL,
-					 GTK_MESSAGE_ERROR,
-					 GTK_BUTTONS_CLOSE,
-					 "%s", _(primary_text));
-	gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
-						  "%s", _(secondary_text));
-	gtk_dialog_run (GTK_DIALOG (dialog));
-	gtk_widget_destroy (dialog);
-}
-
-static GObject*
-gst_tool_constructor (GType                  type,
-		      guint                  n_construct_properties,
-		      GObjectConstructParam *construct_params)
-{
-	GObject *object;
-	GstTool *tool;
-	gchar *widget_name;
-	GtkWidget *dialog;
-	OobsResult result;
-
-	object = (* G_OBJECT_CLASS (gst_tool_parent_class)->constructor) (type,
-									  n_construct_properties,
-									  construct_params);
-	tool = GST_TOOL (object);
-
-	if (tool->title)
-		g_set_application_name (tool->title);
-
-	if (tool->icon)
-		gtk_window_set_default_icon_name (tool->icon);
-
-	if (tool->name) {
-		tool->ui_path = g_strdup_printf (INTERFACES_DIR "/%s.ui", tool->name);
-
-		widget_name = g_strdup_printf ("%s_admin", tool->name);
-		tool->main_dialog = gst_dialog_new (tool, widget_name, tool->title, tool->show_lock_button);
-		g_free (widget_name);
-	}
-
-	result = oobs_session_get_platform (tool->session, NULL);
-	if (result == OOBS_RESULT_NO_PLATFORM) {
-		dialog = gst_platform_dialog_new (tool->session);
-		gtk_dialog_run (GTK_DIALOG (dialog));
-		gtk_widget_destroy (dialog);
-	}
-	else if (result != OOBS_RESULT_OK) {
-		show_oobs_error_dialog (tool, OPERATION_UPDATE, result);
-		exit (-1);
-	}
-
-	gst_tool_update_async (tool);
-
-	return object;
-}
-
-static void
-gst_tool_set_property (GObject      *object,
-		       guint         prop_id,
-		       const GValue *value,
-		       GParamSpec   *pspec)
-{
-	GstTool *tool = GST_TOOL (object);
-
-	switch (prop_id) {
-	case PROP_NAME:
-		tool->name = g_value_dup_string (value);
-		break;
-	case PROP_TITLE:
-		tool->title = g_value_dup_string (value);
-		break;
-	case PROP_ICON:
-		tool->icon = g_value_dup_string (value);
-		break;
-	case PROP_SHOW_LOCK_BUTTON:
-		tool->show_lock_button = g_value_get_boolean (value);
-		break;
-	}
-}
-
-static void
-gst_tool_finalize (GObject *object)
-{
-	GstTool *tool = GST_TOOL (object);
-
-	g_free (tool->name);
-	g_free (tool->title);
-	g_free (tool->icon);
-	g_free (tool->ui_path);
-
-	if (tool->session)
-		g_object_unref (tool->session);
-
-	if (tool->main_dialog)
-		gtk_widget_destroy (GTK_WIDGET (tool->main_dialog));
-
-	if (tool->report_window)
-		gtk_widget_destroy (tool->report_window);
-
-	g_ptr_array_free (tool->objects, FALSE);
-
-	(* G_OBJECT_CLASS (gst_tool_parent_class)->finalize) (object);
-}
-
-static void
-gst_tool_impl_close (GstTool *tool)
-{
-	gtk_widget_hide (GTK_WIDGET (tool->main_dialog));
-
-	/* process necessary events to hide the dialog */
-	while (gtk_events_pending ())
-		gtk_main_iteration ();
-
-	/* process pending async requests */
-	oobs_session_process_requests (tool->session);
-
-
-	g_object_unref (tool);
-	gtk_main_quit ();
-}
-
-void
-gst_tool_update_gui (GstTool *tool)
-{
-	g_return_if_fail (GST_IS_TOOL (tool));
-
-	if (GST_TOOL_GET_CLASS (tool)->update_gui)
-		(* GST_TOOL_GET_CLASS (tool)->update_gui) (tool);
-}
-
-void
-gst_tool_update_config (GstTool *tool)
-{
-	g_return_if_fail (GST_IS_TOOL (tool));
-
-	if (GST_TOOL_GET_CLASS (tool)->update_config)
-		(* GST_TOOL_GET_CLASS (tool)->update_config) (tool);
-}
-
-void
-gst_tool_close (GstTool *tool)
-{
-	g_return_if_fail (GST_IS_TOOL (tool));
-
-	if (GST_TOOL_GET_CLASS (tool)->close)
-		(* GST_TOOL_GET_CLASS (tool)->close) (tool);
-}
-
-void
-gst_init_tool (const gchar *app_name, int argc, char *argv [], GOptionEntry *entries)
-{
-	GOptionContext *context;
-
-	bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
-	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-	textdomain (GETTEXT_PACKAGE);
-
-	if (entries) {
-		context = g_option_context_new (NULL);
-		g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE);
-		g_option_context_add_group (context, gtk_get_option_group (TRUE));
-		g_option_context_parse (context, &argc, &argv, NULL);
-		g_option_context_free (context);
-	}
-
-	gtk_init (&argc, &argv);
-}
-
-void
-gst_tool_show_help (GstTool *tool, gchar *section)
-{
-	GdkScreen *screen;
-	GError *error = NULL;
-	GdkAppLaunchContext *launch_context;
-	GAppInfo *app_info;
-	GtkWidget *dialog;
-	gchar *help_file, *help_file_xml, *command, *uri;
-	const gchar **langs, *lang;
-	gint i;
-
-	langs = (const gchar **) g_get_language_names ();
-	help_file = g_strdup_printf ("%s-admin", tool->name);
-	help_file_xml = g_strdup_printf ("%s-admin.xml", tool->name);
-
-	for (i = 0; langs[i]; i++) {
-		lang = langs[i];
-
-		if (strchr (lang, '.')) {
-			continue;
-		}
-
-		uri = g_build_filename(DATADIR,
-				       "/gnome/help/",
-				       help_file,
-				       lang,
-				       help_file_xml,
-				       NULL);
-
-		if (g_file_test (uri, G_FILE_TEST_EXISTS)) {
-                    break;
-		}
-	}
-
-	if (section) {
-		command = g_strconcat ("gnome-help ghelp://", uri, "?", section, NULL);
-	} else {
-		command = g_strconcat ("gnome-help ghelp://", uri, NULL);
-	}
-
-
-	app_info = g_app_info_create_from_commandline (command, _("Help"),
-                                                       G_APP_INFO_CREATE_NONE,
-                                                       &error);
-
-	screen = gtk_window_get_screen (GTK_WINDOW (tool->main_dialog));
-
-	g_free (command);
-	g_free (uri);
-	g_free (help_file_xml);
-	g_free (help_file);
-
-	if (error)
-		goto error;
-
-	launch_context = gdk_app_launch_context_new ();
-	gdk_app_launch_context_set_screen (launch_context, screen);
-	g_app_info_launch (app_info, NULL, G_APP_LAUNCH_CONTEXT (launch_context), &error);
-
-	g_object_unref (launch_context);
-	g_object_unref (app_info);
-
-	if (error)
-		goto error;
-
-	return;
-
-error:
-	dialog = gtk_message_dialog_new (GTK_WINDOW (tool->main_dialog),
-	                                 GTK_DIALOG_MODAL,
-	                                 GTK_MESSAGE_ERROR,
-	                                 GTK_BUTTONS_CLOSE,
-	                                 _("Could not display help"));
-	gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
-	                                          "%s", error->message);
-	gtk_dialog_run (GTK_DIALOG (dialog));
-	gtk_widget_destroy (dialog);
-	g_error_free (error);
-}
-
-static gboolean
-gst_tool_report_progress_animate (GstTool *tool)
-{
-	gtk_progress_bar_pulse (GTK_PROGRESS_BAR (tool->report_progress));
-	return TRUE;
-}
-
-static gboolean
-gst_tool_report_window_timeout (GstTool *tool)
-{
-	gtk_window_set_transient_for (GTK_WINDOW (tool->report_window), GTK_WINDOW (tool->main_dialog));
-	gtk_widget_show (tool->report_window);
-
-	tool->report_timeout_id = 0;
-	return FALSE;
-}
-
-static void
-gst_tool_show_report_window (GstTool *tool, const gchar *report)
-{
-	gchar *markup;
-
-	if (tool->report_timeout_id != 0)
-		return;
-
-	if (report) {
-		markup = g_strdup_printf ("<span weight=\"bold\" size=\"larger\">%s</span>", report);
-		gtk_label_set_markup (GTK_LABEL (tool->report_label), markup);
-		g_free (markup);
-
-		tool->report_timeout_id = g_timeout_add (2000, (GSourceFunc) gst_tool_report_window_timeout, tool);
-		tool->report_animate_id = g_timeout_add (150,  (GSourceFunc) gst_tool_report_progress_animate, tool);
-	}
-}
-
-static void
-gst_tool_hide_report_window (GstTool *tool)
-{
-	if (tool->report_timeout_id) {
-		g_source_remove (tool->report_timeout_id);
-		tool->report_timeout_id = 0;
-	}
-
-	if (tool->report_animate_id) {
-		g_source_remove (tool->report_animate_id);
-		tool->report_animate_id = 0;
-	}
-
-	gtk_widget_hide (tool->report_window);
-}
-
-/* Simple wrapper around oobs_object_commit() that shows an error if needed */
-OobsResult
-gst_tool_commit (GstTool    *tool,
-		 OobsObject *object)
-{
-	OobsResult result = oobs_object_commit (object);
-
-	if (result != OOBS_RESULT_OK)
-		show_oobs_error_dialog (tool, OPERATION_COMMIT, result);
-
-	return result;
-}
-
-/* Same as gst_tool_commit, but taking the result from an already run operation.
-   Used for non-standard commit methods, such as oobs_users_config_add_user(). */
-void
-gst_tool_commit_error (GstTool   *tool,
-                       OobsResult result)
-{
-	if (result != OOBS_RESULT_OK)
-		show_oobs_error_dialog (tool, OPERATION_COMMIT, result);
-}
-
-static void
-on_commit_finalized (OobsObject *object,
-		     OobsResult  result,
-		     gpointer    data)
-{
-	GstAsyncData *user_data = (GstAsyncData *) data;
-
-	gst_tool_hide_report_window (user_data->tool);
-
-	if (result != OOBS_RESULT_OK)
-		show_oobs_error_dialog (user_data->tool, OPERATION_COMMIT, result);
-
-	if (user_data->func)
-		(* user_data->func) (object, result, user_data->data);
-
-	g_slice_free (GstAsyncData, user_data);
-}
-
-void
-gst_tool_commit_async (GstTool             *tool,
-		       OobsObject          *object,
-		       const gchar         *message,
-		       OobsObjectAsyncFunc  func,
-		       gpointer             data)
-{
-	GstAsyncData *user_data;
-
-	user_data = g_slice_new (GstAsyncData);
-	user_data->tool = tool;
-	user_data->func = func;
-	user_data->data = data;
-
-	tool->last_commit_time = time (NULL);
-
-	if (message)
-		gst_tool_show_report_window (tool, message);
-
-	oobs_object_commit_async (object, on_commit_finalized, user_data);
-}
-
-static void
-update_async_func (OobsObject *object,
-		   OobsResult  result,
-		   gpointer    data)
-{
-	GstTool *tool = GST_TOOL (data);
-	gst_dialog_thaw (tool->main_dialog);
-
-	if (gst_dialog_get_freeze_level (tool->main_dialog) == 0) {
-		/* everything is now updated */
-		gst_tool_update_config (tool);
-		gst_tool_update_gui (tool);
-	}
-}
-
-void
-gst_tool_update_async (GstTool *tool)
-{
-	guint i;
-
-	g_return_if_fail (GST_IS_TOOL (tool));
-
-	for (i = 0; i < tool->objects->len; i++) {
-		OobsObject *object = g_ptr_array_index (tool->objects, i);
-
-		gst_dialog_freeze (tool->main_dialog);
-		oobs_object_update_async (object,
-					  update_async_func,
-					  tool);
-	}
-}
-
-GtkIconTheme*
-gst_tool_get_icon_theme (GstTool *tool)
-{
-	return tool->icon_theme;
-}
-
-static void
-configuration_object_changed (OobsObject *object,
-			      GstTool    *tool)
-{
-	gboolean do_update = TRUE;
-	time_t current_time;
-
-	current_time = time (NULL);
-
-	/* If we get ::changed shortly after having committed,
-	 * there's a good chance that the tool has been the
-	 * origin of the change. Of course there could be the
-	 * possibility that this isn't true, but will happen
-	 * quite rarely.
-	 */
-	if (current_time - tool->last_commit_time <= 2)
-		return;
-
-	if (gst_dialog_get_editing (tool->main_dialog)) {
-		GtkWidget *parent, *dialog;
-		gint response;
-
-		if (tool->configuration_changed_dialog)
-			return;
-
-		parent = gst_dialog_get_topmost_edit_dialog (tool->main_dialog);
-		dialog = gtk_message_dialog_new (GTK_WINDOW (parent),
-						 GTK_DIALOG_MODAL,
-						 GTK_MESSAGE_QUESTION,
-						 GTK_BUTTONS_YES_NO,
-						 _("The system configuration has potentially changed."));
-		gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
-							  _("Update content? This will lose any modification in course."));
-		tool->configuration_changed_dialog = dialog;
-
-		response = gtk_dialog_run (GTK_DIALOG (dialog));
-		do_update = (response == GTK_RESPONSE_YES);
-
-		gtk_widget_destroy (dialog);
-		tool->configuration_changed_dialog = NULL;
-	}
-
-	if (do_update) {
-		gst_dialog_stop_editing (tool->main_dialog);
-		gst_tool_update_async (tool);
-	}
-}
-
-static void
-configuration_object_committed (OobsObject *object,
-				GstTool    *tool)
-{
-	tool->last_commit_time = time (NULL);
-}
-
-void
-gst_tool_add_configuration_object (GstTool    *tool,
-                                   OobsObject *object,
-                                   gboolean    watch_updates)
-{
-	g_return_if_fail (GST_IS_TOOL (tool));
-	g_return_if_fail (OOBS_IS_OBJECT (object));
-
-	g_signal_connect (object, "committed",
-			  G_CALLBACK (configuration_object_committed), tool);
-
-	/* For child objects like OobsUser or OobsService, we don't want
-	 * to get updates directly: instead, we update OobsUsersConfig and OobsServicesConfig,
-	 * and drop old child objects.
-	 */
-	if (watch_updates) {
-		g_ptr_array_add (tool->objects, object);
-
-		g_signal_connect (object, "changed",
-		                  G_CALLBACK (configuration_object_changed), tool);
-	}
-}
-
-/*
- * Wrapper around oobs_object_authenticate() to show an error dialog if needed.
- */
-gboolean
-gst_tool_authenticate (GstTool    *tool,
-                       OobsObject *object)
-{
-	gboolean result;
-	GError *error = NULL;
-
-        result = oobs_object_authenticate (object, &error);
-
-	/* Don't show an error if the user manually cancelled authentication */
-	if (error && error->code != OOBS_ERROR_AUTHENTICATION_CANCELLED) {
-		GtkWidget *dialog;
-
-		dialog = gtk_message_dialog_new (GTK_WINDOW (tool->main_dialog),
-		                                 GTK_DIALOG_MODAL,
-		                                 GTK_MESSAGE_ERROR,
-		                                 GTK_BUTTONS_CLOSE,
-		                                 "%s",
-		                                 _("You are not allowed to modify the system configuration."));
-		gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
-		                                          _("An error occurred while checking for authorizations: %s\n"
-		                                            "You may report this as a bug."),
-		                                          error->message);
-		gtk_dialog_run (GTK_DIALOG (dialog));
-
-		gtk_widget_destroy (dialog);
-	}
-
-	if (error)
-		g_error_free (error);
-
-	return result;
-}

=== removed directory '.pc/10_disable_interfaces.patch'
=== removed directory '.pc/10_disable_interfaces.patch/interfaces'
=== removed file '.pc/10_disable_interfaces.patch/interfaces/network.ui'
--- .pc/10_disable_interfaces.patch/interfaces/network.ui	2011-12-16 17:08:20 +0000
+++ .pc/10_disable_interfaces.patch/interfaces/network.ui	1970-01-01 00:00:00 +0000
@@ -1,1817 +0,0 @@
-<?xml version="1.0"?>
-<interface>
-  <requires lib="gtk+" version="2.16"/>
-  <!-- interface-naming-policy project-wide -->
-  <object class="GtkListStore" id="liststore1">
-    <columns>
-      <!-- column-name item -->
-      <column type="gchararray"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes">Off</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Low</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Medium</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Loud</col>
-      </row>
-    </data>
-  </object>
-  <object class="GtkListStore" id="liststore2">
-    <columns>
-      <!-- column-name item -->
-      <column type="gchararray"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes">Tones</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Pulses</col>
-      </row>
-    </data>
-  </object>
-  <object class="GtkListStore" id="liststore3">
-    <columns>
-      <!-- column-name item -->
-      <column type="gchararray"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0">/dev/modem</col>
-      </row>
-      <row>
-        <col id="0">/dev/ttyS0</col>
-      </row>
-      <row>
-        <col id="0">/dev/ttyS1</col>
-      </row>
-      <row>
-        <col id="0">/dev/ttyS2</col>
-      </row>
-      <row>
-        <col id="0">/dev/ttyS3</col>
-      </row>
-    </data>
-  </object>
-  <object class="GtkListStore" id="liststore4">
-    <columns>
-      <!-- column-name item -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
-  <object class="GtkListStore" id="liststore5">
-    <columns>
-      <!-- column-name item -->
-      <column type="gchararray"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes">Plain (ASCII)</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Hexadecimal</col>
-      </row>
-    </data>
-  </object>
-  <object class="GtkWindow" id="main_dialog">
-    <child>
-      <object class="GtkVBox" id="network_admin">
-        <property name="visible">True</property>
-        <property name="border_width">6</property>
-        <property name="spacing">12</property>
-        <child>
-          <object class="GtkHBox" id="locations_box">
-            <property name="visible">True</property>
-            <property name="spacing">6</property>
-            <child>
-              <object class="GtkLabel" id="label2">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">Location:</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkComboBox" id="locations_combo">
-                <property name="visible">True</property>
-              </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="add_location">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="tooltip_text" translatable="yes">Save current network configuration as a location</property>
-                <accelerator key="A" signal="clicked" modifiers="GDK_MOD1_MASK"/>
-                <child>
-                  <object class="GtkImage" id="image9">
-                    <property name="visible">True</property>
-                    <property name="stock">gtk-save</property>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="remove_location">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="tooltip_text" translatable="yes">Delete current location</property>
-                <accelerator key="R" signal="clicked" modifiers="GDK_MOD1_MASK"/>
-                <child>
-                  <object class="GtkImage" id="image10">
-                    <property name="visible">True</property>
-                    <property name="stock">gtk-delete</property>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">3</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkNotebook" id="notebook1">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <child>
-              <object class="GtkHBox" id="hbox3">
-                <property name="visible">True</property>
-                <property name="border_width">12</property>
-                <property name="spacing">6</property>
-                <child>
-                  <object class="GtkScrolledWindow" id="scrolledwindow1">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="hscrollbar_policy">automatic</property>
-                    <property name="vscrollbar_policy">automatic</property>
-                    <property name="shadow_type">in</property>
-                    <child>
-                      <object class="GtkTreeView" id="interfaces_list">
-                        <property name="width_request">290</property>
-                        <property name="height_request">194</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="headers_visible">False</property>
-                        <property name="rules_hint">True</property>
-                        <property name="enable_search">False</property>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkVButtonBox" id="vbuttonbox1">
-                    <property name="visible">True</property>
-                    <property name="spacing">6</property>
-                    <property name="layout_style">start</property>
-                    <child>
-                      <object class="GtkButton" id="properties_button">
-                        <property name="label">gtk-properties</property>
-                        <property name="visible">True</property>
-                        <property name="sensitive">False</property>
-                        <property name="can_focus">True</property>
-                        <property name="can_default">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="use_stock">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-            </child>
-            <child type="tab">
-              <object class="GtkLabel" id="label3">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">Connections</property>
-              </object>
-              <packing>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkFrame" id="frame3">
-                <property name="visible">True</property>
-                <property name="border_width">12</property>
-                <property name="label_xalign">0</property>
-                <property name="shadow_type">none</property>
-                <child>
-                  <object class="GtkAlignment" id="alignment11">
-                    <property name="visible">True</property>
-                    <property name="left_padding">12</property>
-                    <child>
-                      <object class="GtkTable" id="table4">
-                        <property name="visible">True</property>
-                        <property name="n_rows">2</property>
-                        <property name="n_columns">2</property>
-                        <property name="column_spacing">12</property>
-                        <property name="row_spacing">6</property>
-                        <child>
-                          <object class="GtkLabel" id="label38">
-                            <property name="visible">True</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Host name:</property>
-                            <property name="use_underline">True</property>
-                            <property name="mnemonic_widget">hostname</property>
-                          </object>
-                          <packing>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label39">
-                            <property name="visible">True</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">D_omain name:</property>
-                            <property name="use_underline">True</property>
-                            <property name="mnemonic_widget">domain</property>
-                          </object>
-                          <packing>
-                            <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkEntry" id="hostname">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
-                            <property name="y_options"></property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkEntry" id="domain">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
-                            <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
-                            <property name="y_options"></property>
-                          </packing>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-                <child type="label">
-                  <object class="GtkLabel" id="label37">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">Host Settings</property>
-                    <attributes>
-                      <attribute name="weight" value="bold"/>
-                    </attributes>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkLabel" id="label4">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">General</property>
-              </object>
-              <packing>
-                <property name="position">1</property>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkVBox" id="vbox7">
-                <property name="visible">True</property>
-                <property name="border_width">12</property>
-                <property name="spacing">18</property>
-                <child>
-                  <object class="GtkFrame" id="frame1">
-                    <property name="visible">True</property>
-                    <property name="label_xalign">0</property>
-                    <property name="shadow_type">none</property>
-                    <child>
-                      <object class="GtkAlignment" id="alignment9">
-                        <property name="visible">True</property>
-                        <property name="left_padding">12</property>
-                        <child>
-                          <object class="GtkHBox" id="hbox10">
-                            <property name="visible">True</property>
-                            <property name="spacing">6</property>
-                            <child>
-                              <object class="GtkScrolledWindow" id="scrolledwindow2">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="hscrollbar_policy">automatic</property>
-                                <property name="vscrollbar_policy">automatic</property>
-                                <property name="shadow_type">in</property>
-                                <child>
-                                  <object class="GtkTreeView" id="dns_list">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="headers_visible">False</property>
-                                    <property name="reorderable">True</property>
-                                    <property name="rules_hint">True</property>
-                                    <property name="enable_search">False</property>
-                                  </object>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkVButtonBox" id="vbuttonbox2">
-                                <property name="visible">True</property>
-                                <property name="spacing">6</property>
-                                <property name="layout_style">start</property>
-                                <child>
-                                  <object class="GtkButton" id="dns_list_add">
-                                    <property name="label">gtk-add</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="can_default">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="use_stock">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkButton" id="dns_list_delete">
-                                    <property name="label">gtk-delete</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="can_default">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="use_stock">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                    <child type="label">
-                      <object class="GtkLabel" id="label35">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">DNS Servers</property>
-                        <attributes>
-                          <attribute name="weight" value="bold"/>
-                        </attributes>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkFrame" id="frame2">
-                    <property name="visible">True</property>
-                    <property name="label_xalign">0</property>
-                    <property name="shadow_type">none</property>
-                    <child>
-                      <object class="GtkAlignment" id="alignment10">
-                        <property name="visible">True</property>
-                        <property name="left_padding">12</property>
-                        <child>
-                          <object class="GtkHBox" id="hbox11">
-                            <property name="visible">True</property>
-                            <property name="spacing">6</property>
-                            <child>
-                              <object class="GtkScrolledWindow" id="scrolledwindow3">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="hscrollbar_policy">automatic</property>
-                                <property name="vscrollbar_policy">automatic</property>
-                                <property name="shadow_type">in</property>
-                                <child>
-                                  <object class="GtkTreeView" id="search_domain_list">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="headers_visible">False</property>
-                                    <property name="reorderable">True</property>
-                                    <property name="rules_hint">True</property>
-                                    <property name="enable_search">False</property>
-                                  </object>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkVButtonBox" id="vbuttonbox3">
-                                <property name="visible">True</property>
-                                <property name="spacing">6</property>
-                                <property name="layout_style">start</property>
-                                <child>
-                                  <object class="GtkButton" id="search_domain_add">
-                                    <property name="label">gtk-add</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="can_default">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="use_stock">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkButton" id="search_domain_delete">
-                                    <property name="label">gtk-delete</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="can_default">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="use_stock">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                    <child type="label">
-                      <object class="GtkLabel" id="label36">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">Search Domains</property>
-                        <attributes>
-                          <attribute name="weight" value="bold"/>
-                        </attributes>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">2</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkLabel" id="label5">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">DNS</property>
-              </object>
-              <packing>
-                <property name="position">2</property>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkHBox" id="hbox12">
-                <property name="visible">True</property>
-                <property name="border_width">12</property>
-                <property name="spacing">6</property>
-                <child>
-                  <object class="GtkScrolledWindow" id="scrolledwindow5">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="hscrollbar_policy">automatic</property>
-                    <property name="vscrollbar_policy">automatic</property>
-                    <property name="shadow_type">in</property>
-                    <child>
-                      <object class="GtkTreeView" id="host_aliases_list">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="rules_hint">True</property>
-                        <property name="enable_search">False</property>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkVButtonBox" id="vbuttonbox4">
-                    <property name="visible">True</property>
-                    <property name="spacing">6</property>
-                    <property name="layout_style">start</property>
-                    <child>
-                      <object class="GtkButton" id="host_aliases_add">
-                        <property name="label">gtk-add</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="can_default">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="use_stock">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkButton" id="host_aliases_properties">
-                        <property name="label">gtk-properties</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="can_default">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="use_stock">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkButton" id="host_aliases_delete">
-                        <property name="label">gtk-delete</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="can_default">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="use_stock">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">3</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkLabel" id="label6">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">Hosts</property>
-              </object>
-              <packing>
-                <property name="position">3</property>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
-  <object class="GtkDialog" id="connection_config_dialog">
-    <property name="border_width">5</property>
-    <property name="title" translatable="yes">Interface properties</property>
-    <property name="resizable">False</property>
-    <property name="modal">True</property>
-    <property name="type_hint">dialog</property>
-    <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox3">
-        <property name="visible">True</property>
-        <child>
-          <object class="GtkNotebook" id="connection_notebook">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="border_width">6</property>
-            <child>
-              <object class="GtkVBox" id="connection_general_page">
-                <property name="visible">True</property>
-                <property name="border_width">12</property>
-                <property name="spacing">18</property>
-                <child>
-                  <object class="GtkVBox" id="connection_device_settings">
-                    <property name="visible">True</property>
-                    <property name="spacing">6</property>
-                    <child>
-                      <object class="GtkCheckButton" id="connection_device_active">
-                        <property name="label" translatable="yes">E_nable this connection</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="draw_indicator">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkCheckButton" id="connection_device_roaming">
-                        <property name="label" translatable="yes">E_nable roaming mode</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="draw_indicator">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkHBox" id="connection_ppp_type_box">
-                        <property name="visible">True</property>
-                        <property name="spacing">6</property>
-                        <child>
-                          <object class="GtkLabel" id="label80">
-                            <property name="visible">True</property>
-                            <property name="label" translatable="yes">Connection type:</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkComboBox" id="connection_ppp_type">
-                            <property name="visible">True</property>
-                            <child>
-                              <object class="GtkCellRendererText" id="cellrenderertext6"/>
-                              <attributes>
-                                <attribute name="text">0</attribute>
-                              </attributes>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkFrame" id="connection_wireless">
-                    <property name="visible">True</property>
-                    <property name="sensitive">False</property>
-                    <property name="label_xalign">0</property>
-                    <property name="shadow_type">none</property>
-                    <child>
-                      <object class="GtkAlignment" id="alignment12">
-                        <property name="visible">True</property>
-                        <property name="left_padding">12</property>
-                        <child>
-                          <object class="GtkTable" id="table6">
-                            <property name="visible">True</property>
-                            <property name="border_width">6</property>
-                            <property name="n_rows">3</property>
-                            <property name="n_columns">2</property>
-                            <property name="column_spacing">12</property>
-                            <property name="row_spacing">6</property>
-                            <child>
-                              <object class="GtkLabel" id="label44">
-                                <property name="visible">True</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Network name (_ESSID):</property>
-                                <property name="use_underline">True</property>
-                                <property name="mnemonic_widget">connection_essid</property>
-                              </object>
-                              <packing>
-                                <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkComboBox" id="connection_essid">
-                                <property name="visible">True</property>
-                                <property name="has-entry">True</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="right_attach">2</property>
-                                <property name="x_options">GTK_FILL</property>
-                                <property name="y_options">GTK_FILL</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="label45">
-                                <property name="visible">True</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Network _password:</property>
-                                <property name="use_underline">True</property>
-                                <property name="mnemonic_widget">connection_wep_key</property>
-                              </object>
-                              <packing>
-                                <property name="top_attach">2</property>
-                                <property name="bottom_attach">3</property>
-                                <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkEntry" id="connection_wep_key">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="visibility">False</property>
-                                <property name="activates_default">True</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="right_attach">2</property>
-                                <property name="top_attach">2</property>
-                                <property name="bottom_attach">3</property>
-                                <property name="y_options"></property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="label79">
-                                <property name="visible">True</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Password _type:</property>
-                                <property name="use_underline">True</property>
-                              </object>
-                              <packing>
-                                <property name="top_attach">1</property>
-                                <property name="bottom_attach">2</property>
-                                <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkComboBox" id="connection_wep_key_type">
-                                <property name="visible">True</property>
-                                <property name="model">liststore5</property>
-                                <child>
-                                  <object class="GtkCellRendererText" id="cellrenderertext5"/>
-                                  <attributes>
-                                    <attribute name="text">0</attribute>
-                                  </attributes>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="right_attach">2</property>
-                                <property name="top_attach">1</property>
-                                <property name="bottom_attach">2</property>
-                                <property name="x_options">GTK_FILL</property>
-                                <property name="y_options">GTK_FILL</property>
-                              </packing>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                    <child type="label">
-                      <object class="GtkLabel" id="label43">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">Wireless Settings</property>
-                        <attributes>
-                          <attribute name="weight" value="bold"/>
-                        </attributes>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkFrame" id="connection_ethernet">
-                    <property name="visible">True</property>
-                    <property name="sensitive">False</property>
-                    <property name="label_xalign">0</property>
-                    <property name="shadow_type">none</property>
-                    <child>
-                      <object class="GtkAlignment" id="alignment13">
-                        <property name="visible">True</property>
-                        <property name="left_padding">12</property>
-                        <child>
-                          <object class="GtkTable" id="table7">
-                            <property name="visible">True</property>
-                            <property name="border_width">6</property>
-                            <property name="n_rows">4</property>
-                            <property name="n_columns">2</property>
-                            <property name="column_spacing">13</property>
-                            <property name="row_spacing">6</property>
-                            <child>
-                              <object class="GtkLabel" id="label47">
-                                <property name="visible">True</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Con_figuration:</property>
-                                <property name="use_underline">True</property>
-                                <property name="mnemonic_widget">connection_bootproto</property>
-                              </object>
-                              <packing>
-                                <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="label48">
-                                <property name="visible">True</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">_IP address:</property>
-                                <property name="use_underline">True</property>
-                                <property name="mnemonic_widget">connection_address</property>
-                              </object>
-                              <packing>
-                                <property name="top_attach">1</property>
-                                <property name="bottom_attach">2</property>
-                                <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="label49">
-                                <property name="visible">True</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">_Subnet mask:</property>
-                                <property name="use_underline">True</property>
-                                <property name="mnemonic_widget">connection_netmask</property>
-                              </object>
-                              <packing>
-                                <property name="top_attach">2</property>
-                                <property name="bottom_attach">3</property>
-                                <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="label50">
-                                <property name="visible">True</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">_Gateway address:</property>
-                                <property name="use_underline">True</property>
-                                <property name="mnemonic_widget">connection_gateway</property>
-                              </object>
-                              <packing>
-                                <property name="top_attach">3</property>
-                                <property name="bottom_attach">4</property>
-                                <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkEntry" id="connection_address">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="activates_default">True</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="right_attach">2</property>
-                                <property name="top_attach">1</property>
-                                <property name="bottom_attach">2</property>
-                                <property name="y_options"></property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkEntry" id="connection_netmask">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="activates_default">True</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="right_attach">2</property>
-                                <property name="top_attach">2</property>
-                                <property name="bottom_attach">3</property>
-                                <property name="y_options"></property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkEntry" id="connection_gateway">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="activates_default">True</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="right_attach">2</property>
-                                <property name="top_attach">3</property>
-                                <property name="bottom_attach">4</property>
-                                <property name="y_options"></property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkComboBox" id="connection_bootproto">
-                                <property name="visible">True</property>
-                                <property name="model">liststore4</property>
-                                <child>
-                                  <object class="GtkCellRendererText" id="cellrenderertext4"/>
-                                  <attributes>
-                                    <attribute name="text">0</attribute>
-                                  </attributes>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="right_attach">2</property>
-                                <property name="x_options">GTK_FILL</property>
-                                <property name="y_options">GTK_FILL</property>
-                              </packing>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                    <child type="label">
-                      <object class="GtkLabel" id="label46">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">Connection Settings</property>
-                        <attributes>
-                          <attribute name="weight" value="bold"/>
-                        </attributes>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkFrame" id="connection_plip">
-                    <property name="visible">True</property>
-                    <property name="sensitive">False</property>
-                    <property name="label_xalign">0</property>
-                    <property name="shadow_type">none</property>
-                    <child>
-                      <object class="GtkAlignment" id="alignment14">
-                        <property name="visible">True</property>
-                        <property name="left_padding">12</property>
-                        <child>
-                          <object class="GtkTable" id="table8">
-                            <property name="visible">True</property>
-                            <property name="border_width">6</property>
-                            <property name="n_rows">2</property>
-                            <property name="n_columns">2</property>
-                            <property name="column_spacing">12</property>
-                            <property name="row_spacing">6</property>
-                            <child>
-                              <object class="GtkLabel" id="label52">
-                                <property name="visible">True</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">_Local IP:</property>
-                                <property name="use_underline">True</property>
-                                <property name="mnemonic_widget">connection_local_address</property>
-                              </object>
-                              <packing>
-                                <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="label53">
-                                <property name="visible">True</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">_Remote IP:</property>
-                                <property name="use_underline">True</property>
-                                <property name="mnemonic_widget">connection_remote_address</property>
-                              </object>
-                              <packing>
-                                <property name="top_attach">1</property>
-                                <property name="bottom_attach">2</property>
-                                <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkEntry" id="connection_local_address">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="activates_default">True</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="right_attach">2</property>
-                                <property name="y_options"></property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkEntry" id="connection_remote_address">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="activates_default">True</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="right_attach">2</property>
-                                <property name="top_attach">1</property>
-                                <property name="bottom_attach">2</property>
-                                <property name="y_options"></property>
-                              </packing>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                    <child type="label">
-                      <object class="GtkLabel" id="label51">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">Connection Settings</property>
-                        <attributes>
-                          <attribute name="weight" value="bold"/>
-                        </attributes>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">3</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkFrame" id="isp_data">
-                    <property name="visible">True</property>
-                    <property name="label_xalign">0</property>
-                    <property name="shadow_type">none</property>
-                    <child>
-                      <object class="GtkAlignment" id="alignment17">
-                        <property name="visible">True</property>
-                        <property name="left_padding">12</property>
-                        <child>
-                          <object class="GtkVBox" id="vbox14">
-                            <property name="visible">True</property>
-                            <child>
-                              <object class="GtkTable" id="connection_modem_isp_table">
-                                <property name="visible">True</property>
-                                <property name="border_width">6</property>
-                                <property name="n_rows">2</property>
-                                <property name="n_columns">2</property>
-                                <property name="column_spacing">12</property>
-                                <property name="row_spacing">6</property>
-                                <child>
-                                  <object class="GtkLabel" id="label61">
-                                    <property name="visible">True</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">_Phone number:</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="mnemonic_widget">connection_phone_number</property>
-                                  </object>
-                                  <packing>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"></property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="label62">
-                                    <property name="visible">True</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">_Dial prefix:</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="mnemonic_widget">connection_dial_prefix</property>
-                                  </object>
-                                  <packing>
-                                    <property name="top_attach">1</property>
-                                    <property name="bottom_attach">2</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"></property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkEntry" id="connection_phone_number">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="activates_default">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="right_attach">2</property>
-                                    <property name="y_options"></property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkEntry" id="connection_dial_prefix">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="activates_default">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="right_attach">2</property>
-                                    <property name="top_attach">1</property>
-                                    <property name="bottom_attach">2</property>
-                                    <property name="y_options"></property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkHBox" id="connection_gprs_isp_table">
-                                <property name="visible">True</property>
-                                <property name="spacing">12</property>
-                                <child>
-                                  <object class="GtkLabel" id="connection_apn_label">
-                                    <property name="visible">True</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Access point name:</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkEntry" id="connection_apn">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                    <child type="label">
-                      <object class="GtkLabel" id="label60">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">Internet service provider data</property>
-                        <attributes>
-                          <attribute name="weight" value="bold"/>
-                        </attributes>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="position">4</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkFrame" id="isp_account_data">
-                    <property name="visible">True</property>
-                    <property name="label_xalign">0</property>
-                    <property name="shadow_type">none</property>
-                    <child>
-                      <object class="GtkAlignment" id="alignment18">
-                        <property name="visible">True</property>
-                        <property name="left_padding">12</property>
-                        <child>
-                          <object class="GtkTable" id="table11">
-                            <property name="visible">True</property>
-                            <property name="border_width">6</property>
-                            <property name="n_rows">2</property>
-                            <property name="n_columns">2</property>
-                            <property name="column_spacing">12</property>
-                            <property name="row_spacing">6</property>
-                            <child>
-                              <object class="GtkLabel" id="label64">
-                                <property name="visible">True</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">_Username:</property>
-                                <property name="use_underline">True</property>
-                                <property name="mnemonic_widget">connection_login</property>
-                              </object>
-                              <packing>
-                                <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="label65">
-                                <property name="visible">True</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">P_assword</property>
-                                <property name="use_underline">True</property>
-                                <property name="mnemonic_widget">connection_password</property>
-                              </object>
-                              <packing>
-                                <property name="top_attach">1</property>
-                                <property name="bottom_attach">2</property>
-                                <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkEntry" id="connection_login">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="activates_default">True</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="right_attach">2</property>
-                                <property name="y_options"></property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkEntry" id="connection_password">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="visibility">False</property>
-                                <property name="activates_default">True</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="right_attach">2</property>
-                                <property name="top_attach">1</property>
-                                <property name="bottom_attach">2</property>
-                                <property name="y_options"></property>
-                              </packing>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                    <child type="label">
-                      <object class="GtkLabel" id="label63">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">Account data</property>
-                        <attributes>
-                          <attribute name="weight" value="bold"/>
-                        </attributes>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="position">5</property>
-                  </packing>
-                </child>
-              </object>
-            </child>
-            <child type="tab">
-              <object class="GtkLabel" id="label42">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">General</property>
-              </object>
-              <packing>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkFrame" id="connection_modem_page">
-                <property name="visible">True</property>
-                <property name="sensitive">False</property>
-                <property name="border_width">12</property>
-                <property name="label_xalign">0</property>
-                <property name="shadow_type">none</property>
-                <child>
-                  <object class="GtkAlignment" id="alignment15">
-                    <property name="visible">True</property>
-                    <property name="left_padding">12</property>
-                    <child>
-                      <object class="GtkVBox" id="vbox15">
-                        <property name="visible">True</property>
-                        <child>
-                          <object class="GtkTable" id="connection_modem_settings_table">
-                            <property name="visible">True</property>
-                            <property name="border_width">6</property>
-                            <property name="n_rows">3</property>
-                            <property name="n_columns">3</property>
-                            <property name="column_spacing">12</property>
-                            <property name="row_spacing">6</property>
-                            <child>
-                              <object class="GtkLabel" id="label56">
-                                <property name="visible">True</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">_Modem port:</property>
-                                <property name="use_underline">True</property>
-                              </object>
-                              <packing>
-                                <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="label57">
-                                <property name="visible">True</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">_Dial type:</property>
-                                <property name="use_underline">True</property>
-                              </object>
-                              <packing>
-                                <property name="top_attach">1</property>
-                                <property name="bottom_attach">2</property>
-                                <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="label58">
-                                <property name="visible">True</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes" comments="TRANSLATORS: Volume as in loudness">_Volume:</property>
-                                <property name="use_underline">True</property>
-                              </object>
-                              <packing>
-                                <property name="top_attach">2</property>
-                                <property name="bottom_attach">3</property>
-                                <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkButton" id="connection_detect_modem">
-                                <property name="label" translatable="yes">_Autodetect</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="use_underline">True</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">2</property>
-                                <property name="right_attach">3</property>
-                                <property name="x_options"></property>
-                                <property name="y_options"></property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkComboBox" id="connection_serial_port">
-                                <property name="visible">True</property>
-                                <property name="has-entry">True</property>
-                                <property name="entry-text-column">0</property>
-                                <property name="model">liststore3</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="right_attach">2</property>
-                                <property name="y_options"></property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkComboBox" id="connection_dial_type">
-                                <property name="visible">True</property>
-                                <property name="model">liststore2</property>
-                                <child>
-                                  <object class="GtkCellRendererText" id="cellrenderertext2"/>
-                                  <attributes>
-                                    <attribute name="text">0</attribute>
-                                  </attributes>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="right_attach">2</property>
-                                <property name="top_attach">1</property>
-                                <property name="bottom_attach">2</property>
-                                <property name="y_options">GTK_FILL</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkComboBox" id="connection_volume">
-                                <property name="visible">True</property>
-                                <property name="model">liststore1</property>
-                                <child>
-                                  <object class="GtkCellRendererText" id="cellrenderertext1"/>
-                                  <attributes>
-                                    <attribute name="text">0</attribute>
-                                  </attributes>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="right_attach">2</property>
-                                <property name="top_attach">2</property>
-                                <property name="bottom_attach">3</property>
-                                <property name="x_options">GTK_FILL</property>
-                                <property name="y_options">GTK_FILL</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <placeholder/>
-                            </child>
-                            <child>
-                              <placeholder/>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkHBox" id="connection_pppoe_settings_table">
-                            <property name="visible">True</property>
-                            <property name="spacing">12</property>
-                            <child>
-                              <object class="GtkLabel" id="connection_pppoe_ethernet_label">
-                                <property name="visible">True</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Ethernet interface:</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkComboBox" id="connection_pppoe_ethernet">
-                                <property name="visible">True</property>
-                              </object>
-                              <packing>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-                <child type="label">
-                  <object class="GtkLabel" id="label55">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">Modem Settings</property>
-                    <attributes>
-                      <attribute name="weight" value="bold"/>
-                    </attributes>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkLabel" id="label74">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">Modem</property>
-              </object>
-              <packing>
-                <property name="position">1</property>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkFrame" id="connection_options_page">
-                <property name="visible">True</property>
-                <property name="sensitive">False</property>
-                <property name="border_width">12</property>
-                <property name="label_xalign">0</property>
-                <property name="shadow_type">none</property>
-                <child>
-                  <object class="GtkAlignment" id="alignment19">
-                    <property name="visible">True</property>
-                    <property name="left_padding">12</property>
-                    <child>
-                      <object class="GtkVBox" id="vbox12">
-                        <property name="visible">True</property>
-                        <property name="border_width">6</property>
-                        <property name="spacing">6</property>
-                        <child>
-                          <object class="GtkCheckButton" id="connection_default_gw">
-                            <property name="label" translatable="yes">_Set modem as default route to internet</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="use_underline">True</property>
-                            <property name="draw_indicator">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkCheckButton" id="connection_peerdns">
-                            <property name="label" translatable="yes">Use the Internet service provider nameservers</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="use_underline">True</property>
-                            <property name="draw_indicator">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkCheckButton" id="connection_persist">
-                            <property name="label" translatable="yes">_Retry if the connection breaks or fails to start</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="use_underline">True</property>
-                            <property name="draw_indicator">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-                <child type="label">
-                  <object class="GtkLabel" id="label67">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">Connection Settings</property>
-                    <attributes>
-                      <attribute name="weight" value="bold"/>
-                    </attributes>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="position">2</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkLabel" id="label66">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">Options</property>
-              </object>
-              <packing>
-                <property name="position">2</property>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area3">
-            <property name="visible">True</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="connection_cancel">
-                <property name="label">gtk-cancel</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="connection_ok">
-                <property name="label">gtk-ok</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="has_default">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget response="-6">connection_cancel</action-widget>
-      <action-widget response="-5">connection_ok</action-widget>
-    </action-widgets>
-  </object>
-  <object class="GtkDialog" id="host_aliases_edit_dialog">
-    <property name="title" translatable="yes">Host Alias Properties</property>
-    <property name="modal">True</property>
-    <property name="window_position">center-on-parent</property>
-    <property name="type_hint">dialog</property>
-    <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox4">
-        <property name="visible">True</property>
-        <child>
-          <object class="GtkVBox" id="vbox13">
-            <property name="visible">True</property>
-            <property name="spacing">12</property>
-            <child>
-              <object class="GtkTable" id="table14">
-                <property name="visible">True</property>
-                <property name="border_width">12</property>
-                <property name="n_rows">3</property>
-                <property name="n_columns">2</property>
-                <property name="column_spacing">12</property>
-                <property name="row_spacing">6</property>
-                <child>
-                  <object class="GtkLabel" id="label77">
-                    <property name="visible">True</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">IP address:</property>
-                  </object>
-                  <packing>
-                    <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label78">
-                    <property name="visible">True</property>
-                    <property name="xalign">0</property>
-                    <property name="yalign">0</property>
-                    <property name="label" translatable="yes">Aliases:</property>
-                  </object>
-                  <packing>
-                    <property name="top_attach">1</property>
-                    <property name="bottom_attach">3</property>
-                    <property name="x_options">GTK_FILL</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkEntry" id="host_alias_address">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="right_attach">2</property>
-                    <property name="y_options"></property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkScrolledWindow" id="scrolledwindow7">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="hscrollbar_policy">automatic</property>
-                    <property name="vscrollbar_policy">automatic</property>
-                    <property name="shadow_type">in</property>
-                    <child>
-                      <object class="GtkTextView" id="host_alias_list">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="buffer">textbuffer1</property>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="right_attach">2</property>
-                    <property name="top_attach">1</property>
-                    <property name="bottom_attach">3</property>
-                    <property name="x_options">GTK_FILL</property>
-                    <property name="y_options">GTK_FILL</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">0</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area4">
-            <property name="visible">True</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="cancelbutton2">
-                <property name="label">gtk-cancel</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="host_alias_ok_button">
-                <property name="label">gtk-ok</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget response="-6">cancelbutton2</action-widget>
-      <action-widget response="-5">host_alias_ok_button</action-widget>
-    </action-widgets>
-  </object>
-  <object class="GtkTextBuffer" id="textbuffer1"/>
-</interface>

=== removed directory '.pc/10_disable_interfaces.patch/src'
=== removed directory '.pc/10_disable_interfaces.patch/src/network'
=== removed file '.pc/10_disable_interfaces.patch/src/network/network-tool.c'
--- .pc/10_disable_interfaces.patch/src/network/network-tool.c	2010-05-05 19:45:28 +0000
+++ .pc/10_disable_interfaces.patch/src/network/network-tool.c	1970-01-01 00:00:00 +0000
@@ -1,283 +0,0 @@
-/* -*- Mode: C; c-file-style: "gnu"; tab-width: 8 -*- */
-/* Copyright (C) 2004 Carlos Garnacho
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- *
- * Authors: Carlos Garnacho Parro  <[e-mail]>
- */
-
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-#include "gst.h"
-#include "network-tool.h"
-#include "ifaces-list.h"
-#include "connection.h"
-#include "callbacks.h"
-#include "hosts.h"
-#include "locations-combo.h"
-
-static void gst_network_tool_class_init (GstNetworkToolClass *class);
-static void gst_network_tool_init       (GstNetworkTool      *tool);
-static void gst_network_tool_finalize   (GObject             *object);
-
-static GObject* gst_network_tool_constructor (GType                  type,
-					      guint                  n_construct_properties,
-					      GObjectConstructParam *construct_params);
-
-static void gst_network_tool_update_gui    (GstTool *tool);
-
-
-G_DEFINE_TYPE (GstNetworkTool, gst_network_tool, GST_TYPE_TOOL);
-
-static void
-gst_network_tool_class_init (GstNetworkToolClass *class)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (class);
-  GstToolClass *tool_class = GST_TOOL_CLASS (class);
-
-  object_class->constructor = gst_network_tool_constructor;
-  object_class->finalize = gst_network_tool_finalize;
-  tool_class->update_gui = gst_network_tool_update_gui;
-}
-
-static void
-gst_network_tool_init (GstNetworkTool *tool)
-{
-  tool->hosts_config = OOBS_HOSTS_CONFIG (oobs_hosts_config_get ());
-  gst_tool_add_configuration_object (GST_TOOL (tool), OOBS_OBJECT (tool->hosts_config), TRUE);
-  tool->ifaces_config = OOBS_IFACES_CONFIG (oobs_ifaces_config_get ());
-  gst_tool_add_configuration_object (GST_TOOL (tool), OOBS_OBJECT (tool->ifaces_config), TRUE);
-
-  tool->bus_connection = dbus_bus_get (DBUS_BUS_SYSTEM, NULL);
-
-  g_signal_connect_swapped (tool->ifaces_config, "changed",
-			    G_CALLBACK (gst_tool_update_async), tool);
-}
-
-static void
-gst_network_tool_finalize (GObject *object)
-{
-  GstNetworkTool *tool;
-
-  g_return_if_fail (GST_IS_NETWORK_TOOL (object));
-
-  tool = GST_NETWORK_TOOL (object);
-
-  g_object_unref (tool->dns);
-  g_object_unref (tool->search);
-  g_object_unref (tool->interfaces_model);
-  g_object_unref (tool->location);
-  g_free (tool->dialog);
-
-  (* G_OBJECT_CLASS (gst_network_tool_parent_class)->finalize) (object);
-}
-
-static void
-save_dns (GList *list, gpointer data)
-{
-  GstNetworkTool *tool = (GstNetworkTool *) data;
-
-  oobs_hosts_config_set_dns_servers (tool->hosts_config, list);
-  gst_tool_commit (GST_TOOL (tool), OOBS_OBJECT (tool->hosts_config));
-}
-
-static void
-save_search_domains (GList *list, gpointer data)
-{
-  GstNetworkTool *tool = (GstNetworkTool *) data;
-
-  oobs_hosts_config_set_search_domains (tool->hosts_config, list);
-  gst_tool_commit (GST_TOOL (tool), OOBS_OBJECT (tool->hosts_config));
-}
-
-static GObject*
-gst_network_tool_constructor (GType                  type,
-			      guint                  n_construct_properties,
-			      GObjectConstructParam *construct_params)
-{
-  GObject *object;
-  GstNetworkTool *tool;
-  GtkWidget *widget, *add_button, *delete_button;
-
-  object = (* G_OBJECT_CLASS (gst_network_tool_parent_class)->constructor) (type,
-									    n_construct_properties,
-									    construct_params);
-  tool = GST_NETWORK_TOOL (object);
-
-  widget = gst_dialog_get_widget (GST_TOOL (tool)->main_dialog, "dns_list");
-  add_button = gst_dialog_get_widget (GST_TOOL (tool)->main_dialog, "dns_list_add");
-  delete_button = gst_dialog_get_widget (GST_TOOL (tool)->main_dialog, "dns_list_delete");
-  tool->dns = gst_address_list_new (GTK_TREE_VIEW (widget),
-				    GTK_BUTTON (add_button),
-				    GTK_BUTTON (delete_button),
-				    GST_ADDRESS_TYPE_IP);
-  gst_address_list_set_save_func (tool->dns, save_dns, tool);
-
-  widget = gst_dialog_get_widget (GST_TOOL (tool)->main_dialog, "search_domain_list");
-  add_button = gst_dialog_get_widget (GST_TOOL (tool)->main_dialog, "search_domain_add");
-  delete_button = gst_dialog_get_widget (GST_TOOL (tool)->main_dialog, "search_domain_delete");
-  tool->search = gst_address_list_new (GTK_TREE_VIEW (widget),
-				       GTK_BUTTON (add_button),
-				       GTK_BUTTON (delete_button),
-				       GST_ADDRESS_TYPE_DOMAIN);
-  gst_address_list_set_save_func (tool->search, save_search_domains, tool);
-
-  widget = gst_dialog_get_widget (GST_TOOL (tool)->main_dialog, "hostname");
-  tool->hostname = GTK_ENTRY (widget);
-
-  widget = gst_dialog_get_widget (GST_TOOL (tool)->main_dialog, "domain");
-  tool->domain = GTK_ENTRY (widget);
-
-  tool->interfaces_model = ifaces_model_create ();
-  tool->interfaces_list = ifaces_list_create (GST_TOOL (tool));
-  tool->host_aliases_list = host_aliases_list_create (GST_TOOL (tool));
-
-  widget = gst_dialog_get_widget (GST_TOOL (tool)->main_dialog, "locations_combo");
-  add_button = gst_dialog_get_widget (GST_TOOL (tool)->main_dialog, "add_location");
-  delete_button = gst_dialog_get_widget (GST_TOOL (tool)->main_dialog, "remove_location");
-  tool->location = gst_locations_combo_new (GST_TOOL (tool), widget, add_button, delete_button);
-
-  tool->dialog = connection_dialog_init (GST_TOOL (tool));
-  tool->host_aliases_dialog = gst_dialog_get_widget (GST_TOOL (tool)->main_dialog, "host_aliases_edit_dialog");
-
-  return object;
-}
-
-static void
-update_address_list (GstAddressList *address_list,
-		     GList          *list)
-{
-  gst_address_list_clear (address_list);
-
-  while (list)
-    {
-      gst_address_list_add_address (address_list, (const gchar*) list->data);
-      list = list->next;
-    }
-}
-
-static void
-update_hosts_list (OobsList *list)
-{
-  GObject *host;
-  OobsListIter iter;
-  gboolean valid;
-
-  host_aliases_clear ();
-  valid = oobs_list_get_iter_first (list, &iter);
-
-  while (valid)
-    {
-      host = oobs_list_get (list, &iter);
-      host_aliases_add (OOBS_STATIC_HOST (host), &iter);
-      g_object_unref (host);
-
-      valid = oobs_list_iter_next (list, &iter);
-    }
-}
-
-static void
-add_interfaces (GtkTreeView *ifaces_list, OobsList *list)
-{
-  OobsListIter iter;
-  GObject *iface;
-  gboolean valid;
-  gint n_items;
-
-  valid = oobs_list_get_iter_first (list, &iter);
-  n_items = oobs_list_get_n_items (list);
-
-  while (valid)
-    {
-      iface = oobs_list_get (list, &iter);
-      ifaces_model_add_interface (OOBS_IFACE (iface), (n_items > 1));
-
-      g_object_unref (iface);
-      valid = oobs_list_iter_next (list, &iter);
-    }
-}
-
-static void
-add_all_interfaces (GstNetworkTool *network_tool)
-{
-  OobsList *ifaces_list;
-
-  ifaces_list = oobs_ifaces_config_get_ifaces (network_tool->ifaces_config, OOBS_IFACE_TYPE_ETHERNET);
-  add_interfaces (network_tool->interfaces_list, ifaces_list);
-
-  ifaces_list = oobs_ifaces_config_get_ifaces (network_tool->ifaces_config, OOBS_IFACE_TYPE_WIRELESS);
-  add_interfaces (network_tool->interfaces_list, ifaces_list);
-
-  ifaces_list = oobs_ifaces_config_get_ifaces (network_tool->ifaces_config, OOBS_IFACE_TYPE_IRLAN);
-  add_interfaces (network_tool->interfaces_list, ifaces_list);
-
-  ifaces_list = oobs_ifaces_config_get_ifaces (network_tool->ifaces_config, OOBS_IFACE_TYPE_PLIP);
-  add_interfaces (network_tool->interfaces_list, ifaces_list);
-
-  ifaces_list = oobs_ifaces_config_get_ifaces (network_tool->ifaces_config, OOBS_IFACE_TYPE_PPP);
-  add_interfaces (network_tool->interfaces_list, ifaces_list);
-}
-
-static void
-set_entry_text (GtkWidget *entry, const gchar *text)
-{
-  gtk_entry_set_text (GTK_ENTRY (entry), (text) ? text : "");
-}
-
-static void
-gst_network_tool_update_gui (GstTool *tool)
-{
-  GstNetworkTool *network_tool;
-  GList *dns, *search_domains;
-  OobsList *hosts_list;
-
-  network_tool = GST_NETWORK_TOOL (tool);
-
-  dns = oobs_hosts_config_get_dns_servers (network_tool->hosts_config);
-  update_address_list (network_tool->dns, dns);
-  g_list_free (dns);
-
-  search_domains = oobs_hosts_config_get_search_domains (network_tool->hosts_config);
-  update_address_list (network_tool->search, search_domains);
-  g_list_free (search_domains);
-
-  hosts_list = oobs_hosts_config_get_static_hosts (network_tool->hosts_config);
-  update_hosts_list (hosts_list);
-
-  g_signal_handlers_block_by_func (network_tool->hostname, on_entry_changed, tool->main_dialog);
-  set_entry_text (GTK_WIDGET (network_tool->hostname),
-		  oobs_hosts_config_get_hostname (network_tool->hosts_config));
-  g_signal_handlers_unblock_by_func (network_tool->hostname, on_entry_changed, tool->main_dialog);
-
-  g_signal_handlers_block_by_func (network_tool->domain, on_entry_changed, tool->main_dialog);
-  set_entry_text (GTK_WIDGET (network_tool->domain),
-		  oobs_hosts_config_get_domainname (network_tool->hosts_config));
-  g_signal_handlers_unblock_by_func (network_tool->domain, on_entry_changed, tool->main_dialog);
-
-  gtk_list_store_clear (GTK_LIST_STORE (network_tool->interfaces_model));
-  add_all_interfaces (network_tool);
-
-  connection_dialog_update (network_tool->dialog);
-}
-
-GstTool*
-gst_network_tool_new (void)
-{
-  return g_object_new (GST_TYPE_NETWORK_TOOL,
-		       "name", "network",
-		       "title", _("Network Settings"),
-		       "icon", "preferences-system-network",
-		       NULL);
-}

=== removed directory '.pc/11_dont_show_shares.patch'
=== removed directory '.pc/11_dont_show_shares.patch/src'
=== removed directory '.pc/11_dont_show_shares.patch/src/shares'
=== removed file '.pc/11_dont_show_shares.patch/src/shares/shares.desktop.in.in'
--- .pc/11_dont_show_shares.patch/src/shares/shares.desktop.in.in	2011-10-22 20:24:21 +0000
+++ .pc/11_dont_show_shares.patch/src/shares/shares.desktop.in.in	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-[Desktop Entry]
-Version=1.0
-_Name=Shared Folders
-_Comment=Configure which folders are available for your network neighborhood
-Exec=shares-admin
-Icon=folder-remote
-Terminal=false
-Type=Application
-Categories=GNOME;GTK;System;Settings;X-GNOME-NetworkSettings;
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=gnome-system-tools
-X-GNOME-Bugzilla-Component=shares-admin
-X-GNOME-Bugzilla-Version=@VERSION@
-StartupNotify=true
-

=== removed directory '.pc/12_fix_exit.patch'
=== removed directory '.pc/12_fix_exit.patch/src'
=== removed directory '.pc/12_fix_exit.patch/src/users'
=== removed file '.pc/12_fix_exit.patch/src/users/users-tool.c'
--- .pc/12_fix_exit.patch/src/users/users-tool.c	2014-03-12 12:14:31 +0000
+++ .pc/12_fix_exit.patch/src/users/users-tool.c	1970-01-01 00:00:00 +0000
@@ -1,304 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * Copyright (C) 2005 Carlos Garnacho
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- *
- * Authors: Carlos Garnacho Parro <[e-mail]>
- */
-
-#include <glib.h>
-#include <glib/gi18n.h>
-#include "callbacks.h"
-#include "user-profiles.h"
-#include "users-table.h"
-#include "groups-table.h"
-#include "privileges-table.h"
-#include "table.h"
-#include "users-tool.h"
-#include "gst.h"
-
-static void  gst_users_tool_class_init     (GstUsersToolClass *class);
-static void  gst_users_tool_init           (GstUsersTool      *tool);
-static void  gst_users_tool_finalize       (GObject           *object);
-static void  gst_users_tool_update_config  (GstTool *tool);
-
-static GObject* gst_users_tool_constructor (GType                  type,
-					    guint                  n_construct_properties,
-					    GObjectConstructParam *construct_params);
-
-G_DEFINE_TYPE (GstUsersTool, gst_users_tool, GST_TYPE_TOOL);
-
-static void
-gst_users_tool_class_init (GstUsersToolClass *class)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (class);
-	GstToolClass *tool_class = GST_TOOL_CLASS (class);
-
-	object_class->constructor = gst_users_tool_constructor;
-	object_class->finalize = gst_users_tool_finalize;
-	tool_class->update_gui = gst_users_tool_update_gui;
-	tool_class->update_config = gst_users_tool_update_config;
-}
-
-static void
-on_option_changed (GSettings  *settings,
-                   const char *key,
-                   gpointer    user_data)
-{
-	GstTool *tool = GST_TOOL (user_data);
-
-	GST_USERS_TOOL (tool)->showall = g_settings_get_boolean (settings, "showall");
-	GST_USERS_TOOL (tool)->showroot = g_settings_get_boolean (settings, "showroot");
-
-	/* We need to reload the users table since unshown users aren't added */
-	gst_tool_update_gui (tool);
-}
-
-static void
-gst_users_tool_init (GstUsersTool *tool)
-{
-	tool->users_config = oobs_users_config_get ();
-	gst_tool_add_configuration_object (GST_TOOL (tool), tool->users_config, TRUE);
-
-	tool->groups_config = oobs_groups_config_get ();
-	gst_tool_add_configuration_object (GST_TOOL (tool), tool->groups_config, TRUE);
-
-	tool->self_config = oobs_self_config_get ();
-	gst_tool_add_configuration_object (GST_TOOL (tool), tool->self_config, TRUE);
-
-	tool->profiles = gst_user_profiles_get ();
-
-	tool->settings = g_settings_new ("org.gnome.system-tools.users");
-}
-
-static GObject*
-gst_users_tool_constructor (GType                  type,
-			    guint                  n_construct_properties,
-			    GObjectConstructParam *construct_params)
-{
-	GObject *object;
-	GstUsersTool *tool;
-
-	object = (* G_OBJECT_CLASS (gst_users_tool_parent_class)->constructor) (type,
-										n_construct_properties,
-										construct_params);
-
-	tool = GST_USERS_TOOL (object);
-
-	g_signal_connect (tool->settings, "changed::showall",
-	                  (GCallback) on_option_changed, tool);
-	g_signal_connect (tool->settings, "changed::showroot",
-	                  (GCallback) on_option_changed, tool);
-
-	tool->showall = g_settings_get_boolean (tool->settings, "showall");
-	tool->showroot = g_settings_get_boolean (tool->settings, "showroot");
-
-	return object;
-}
-
-static void
-gst_users_tool_finalize (GObject *object)
-{
-	GstUsersTool *tool = GST_USERS_TOOL (object);
-
-	g_object_unref (tool->users_config);
-	g_object_unref (tool->self_config);
-	g_object_unref (tool->groups_config);
-	g_object_unref (tool->profiles);
-	g_object_unref (tool->settings);
-
-	/* Clear models to unreference OobsUsers and OobsGroups
-	 * to be sure they are finalized properly (passwords...) */
-	users_table_clear ();
-	groups_table_clear ();
-
-	(* G_OBJECT_CLASS (gst_users_tool_parent_class)->finalize) (object);
-}
-
-static void
-update_users (GstUsersTool *tool)
-{
-	OobsList *list;
-	OobsListIter iter;
-	OobsUser *user;
-	OobsUser *self;
-	GtkTreePath *path;
-	gboolean valid;
-
-	users_table_clear ();
-	list = oobs_users_config_get_users (OOBS_USERS_CONFIG (tool->users_config));
-	self = oobs_self_config_get_user (OOBS_SELF_CONFIG (tool->self_config));
-
-	valid = oobs_list_get_iter_first (list, &iter);
-
-	while (valid) {
-		user = OOBS_USER (oobs_list_get (list, &iter));
-		path = users_table_add_user (user);
-		gst_tool_add_configuration_object (GST_TOOL (tool), OOBS_OBJECT (user), FALSE);
-
-		if (self == user)
-			users_table_select_path (path);
-
-		g_object_unref (user);
-		gtk_tree_path_free (path);
-		valid = oobs_list_iter_next (list, &iter);
-	}
-}
-
-static void
-update_groups (GstUsersTool *tool)
-{
-	OobsList *list;
-	OobsListIter iter;
-	GObject *group;
-	gboolean valid;
-
-	groups_table_clear ();
-	groups_table_begin_insertions ();
-	privileges_table_clear ();
-
-	list = oobs_groups_config_get_groups (OOBS_GROUPS_CONFIG (tool->groups_config));
-
-	valid = oobs_list_get_iter_first (list, &iter);
-
-	while (valid) {
-		group = oobs_list_get (list, &iter);
-		groups_table_add_group (OOBS_GROUP (group));
-		gst_tool_add_configuration_object (GST_TOOL (tool), OOBS_OBJECT (group), FALSE);
-
-		/* update privileges table too */
-		privileges_table_add_group (OOBS_GROUP (group));
-
-		g_object_unref (group);
-		valid = oobs_list_iter_next (list, &iter);
-	}
-
-	groups_table_end_insertions ();
-}
-
-static void
-update_profiles (GstUsersTool *tool)
-{
-	GList *list, *l;
-	GtkWidget *label1, *label2, *button;
-	GstUserProfile *profile;
-	int max_len, len;
-
-	list = gst_user_profiles_get_list (tool->profiles);
-	table_populate_profiles (tool, list);
-
-	/* Hide profiles line in main dialog if only one profile is available */
-	label1 = gst_dialog_get_widget (GST_TOOL (tool)->main_dialog,
-	                                "user_settings_profile");
-	label2 = gst_dialog_get_widget (GST_TOOL (tool)->main_dialog,
-	                                "user_settings_profile_label");
-	button = gst_dialog_get_widget (GST_TOOL (tool)->main_dialog,
-	                                "edit_user_profile_button");
-
-	if (g_list_length (list) > 1) {
-		gtk_widget_show (label1);
-		gtk_widget_show (label2);
-		gtk_widget_show (button);
-	}
-	else {
-		gtk_widget_hide (label1);
-		gtk_widget_hide (label2);
-		gtk_widget_hide (button);
-		return;
-	}
-
-	/* use the length of the longest profile name to avoid resizing
-	 * the label and moving widgets around */
-	max_len = 0;
-	for (l = list; l; l = l->next) {
-		profile = l->data;
-		len = g_utf8_strlen (profile->name, -1);
-		if (len > max_len)
-			max_len = len;
-	}
-
-	gtk_label_set_width_chars (GTK_LABEL (label1), max_len);
-}
-
-static void
-update_shells (GstUsersTool *tool)
-{
-	GtkWidget *combo;
-	GtkTreeModel *model;
-	GList *shells;
-	GtkTreeIter iter;
-
-	combo = gst_dialog_get_widget (GST_TOOL (tool)->main_dialog, "user_settings_shell");
-	model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo));
-	shells = oobs_users_config_get_available_shells (OOBS_USERS_CONFIG (tool->users_config));
-
-	while (shells) {
-		gtk_list_store_append (GTK_LIST_STORE (model), &iter);
-		gtk_list_store_set (GTK_LIST_STORE (model), &iter,
-				    0, shells->data,
-				    -1);
-		shells = shells->next;
-	}
-}
-
-void
-gst_users_tool_update_gui (GstTool *tool)
-{
-	update_users (GST_USERS_TOOL (tool));
-	update_groups (GST_USERS_TOOL (tool));
-	update_profiles (GST_USERS_TOOL (tool));
-	update_shells (GST_USERS_TOOL (tool));
-}
-
-/*
- * Function called via g_idle_add() when we need to allow signals
- * to be processed before updating.
- */
-gboolean
-gst_users_tool_update_groups_async (gpointer data)
-{
-	update_groups (GST_USERS_TOOL (data));
-
-	return FALSE;
-}
-
-static void
-gst_users_tool_update_config (GstTool *tool)
-{
-	GstUsersTool *users_tool;
-
-	users_tool = GST_USERS_TOOL (tool);
-
-	g_object_get (G_OBJECT (users_tool->users_config),
-		      "minimum-uid", &users_tool->minimum_uid,
-		      "maximum-uid", &users_tool->maximum_uid,
-		      NULL);
-	g_object_get (G_OBJECT (users_tool->groups_config),
-		      "minimum-gid", &users_tool->minimum_gid,
-		      "maximum-gid", &users_tool->maximum_gid,
-		      NULL);
-}
-
-GstTool*
-gst_users_tool_new (void)
-{
-	return g_object_new (GST_TYPE_USERS_TOOL,
-			     "name", "users",
-			     "title", _("Users Settings"),
-			     "icon", "config-users",
-	                     "show-lock-button", FALSE,
-			     NULL);
-}

=== removed directory '.pc/25_sambashare_group_definition.patch'
=== removed directory '.pc/25_sambashare_group_definition.patch/src'
=== removed directory '.pc/25_sambashare_group_definition.patch/src/users'
=== removed file '.pc/25_sambashare_group_definition.patch/src/users/privileges-table.c'
--- .pc/25_sambashare_group_definition.patch/src/users/privileges-table.c	2011-12-16 17:08:20 +0000
+++ .pc/25_sambashare_group_definition.patch/src/users/privileges-table.c	1970-01-01 00:00:00 +0000
@@ -1,278 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* privileges-table.c: this file is part of users-admin, a ximian-setup-tool frontend 
- * for user administration.
- * 
- * Copyright (C) 2004 Carlos Garnacho
- * Copyright (C) 2005 Carlos Garnacho, Sivan Greenberg
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- *
- * Authors: Carlos Garnacho Parro <[e-mail]>
- *          Sivan Greenberg       <[e-mail]>
- */
-
-#include <config.h>
-
-#include <stdlib.h>
-#include <glib/gi18n.h>
-
-#include "gst.h"
-#include "privileges-table.h"
-#include "user-profiles.h"
-#include "user-settings.h"
-
-extern GstTool *tool;
-
-static GtkListStore *privileges_model = NULL;
-
-enum {
-	COL_MEMBER,
-	COL_DESCRIPTION,
-	COL_GROUP
-};
-
-typedef struct _PrivilegeDescription PrivilegeDescription;
-
-struct _PrivilegeDescription {
-	const gchar *group;
-	const gchar *privilege;
-};
-
-/* keep this sorted, or you'll go to hell */
-static const PrivilegeDescription descriptions[] = {
-	{ "adm", N_("Monitor system logs") },
-	{ ADMIN_GROUP, N_("Administer the system") },
-	{ "audio", N_("Use audio devices") },
-	{ "cdrom", N_("Use CD-ROM drives") },
-	{ "cdwrite", N_("Burn CDs / DVDs") },
-	{ "dialout", N_("Use modems") },
-	{ "dip", N_("Connect to Internet using a modem") },
-	{ "fax", N_("Send and receive faxes") },
-	{ "floppy", N_("Use floppy drives") },
-	{ "fuse", N_("Mount user-space filesystems (FUSE)") },
-	{ "lpadmin", N_("Configure printers") },
-	{ "netdev", N_("Connect to wireless and ethernet networks") },
-	{ "plugdev", N_("Access external storage devices automatically") },
-	{ "powerdev", N_("Suspend and hibernate the computer") },
-	{ "proc", N_("Access /proc filesystem") },
-	{ "scanner", N_("Use scanners") },
-	{ "tape", N_("Use tape drives") },
-	{ "usb", N_("Use USB devices") },
-	{ "vboxusers", N_("Use VirtualBox virtualization solution") },
-	{ "video", N_("Use video devices") },
-	{ "wheel", N_("Be able to get administrator privileges") },
-};
-
-static int
-compare_groups (const void *p1, const void *p2)
-{
-	PrivilegeDescription *desc1 = (PrivilegeDescription *) p1;
-	PrivilegeDescription *desc2 = (PrivilegeDescription *) p2;
-
-	return strcmp (desc1->group, desc2->group);
-}
-
-static const PrivilegeDescription*
-privilege_search (const gchar *group)
-{
-	PrivilegeDescription p = { 0, };
-
-	if (!group)
-		return NULL;
-
-	p.group = group;
-
-	return (const PrivilegeDescription *) bsearch (&p, descriptions, G_N_ELEMENTS (descriptions),
-						       sizeof (PrivilegeDescription), compare_groups);
-}
-
-
-static void
-on_user_privilege_toggled (GtkCellRendererToggle *cell, gchar *path_str, gpointer data)
-{
-	GtkTreePath  *path  = gtk_tree_path_new_from_string (path_str);
-	GtkTreeIter   iter;
-	OobsGroup    *group;
-	gboolean      value;
-
-	if (gtk_tree_model_get_iter (GTK_TREE_MODEL (privileges_model), &iter, path)) {
-		gtk_tree_model_get (GTK_TREE_MODEL (privileges_model), &iter,
-		                    COL_MEMBER, &value,
-		                    COL_GROUP, &group, -1);
-
-		/* check that current user should be allowed to lose admin rights,
-		 * possibly showing a warning/error dialog */
-		if (!value || strcmp (oobs_group_get_name (group), ADMIN_GROUP) != 0
-		           || user_settings_check_revoke_admin_rights ())
-			gtk_list_store_set (privileges_model, &iter, COL_MEMBER, !value, -1);
-
-		g_object_unref (group);
-	}
-
-	gtk_tree_path_free (path);
-}
-
-void
-create_user_privileges_table (void)
-{
-	GtkWidget *list;
-	GtkCellRenderer *renderer;
-	GtkTreeViewColumn *column;
-
-	list = gst_dialog_get_widget (tool->main_dialog, "user_privileges");
-
-	privileges_model = gtk_list_store_new (3, G_TYPE_BOOLEAN, G_TYPE_STRING, G_TYPE_OBJECT);
-	gtk_tree_view_set_model (GTK_TREE_VIEW (list), GTK_TREE_MODEL (privileges_model));
-	g_object_unref (privileges_model);
-
-	gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (privileges_model), COL_DESCRIPTION, GTK_SORT_ASCENDING);
-
-	column = gtk_tree_view_column_new ();
-
-	renderer = gtk_cell_renderer_toggle_new ();
-	gtk_tree_view_column_pack_start (column, renderer, FALSE);
-	gtk_tree_view_column_set_attributes (column,
-					     renderer,
-					     "active", COL_MEMBER,
-					     NULL);
-	g_signal_connect (G_OBJECT (renderer), "toggled",
-			  G_CALLBACK (on_user_privilege_toggled), NULL);
-
-	renderer = gtk_cell_renderer_text_new ();
-	gtk_tree_view_column_pack_end (column, renderer, TRUE);
-	gtk_tree_view_column_set_attributes (column,
-					     renderer,
-					     "text", COL_DESCRIPTION,
-					     NULL);
-
-	gtk_tree_view_column_set_sort_column_id (column, 1);
-	gtk_tree_view_insert_column (GTK_TREE_VIEW (list), column, 0);
-}
-
-void
-privileges_table_add_group (OobsGroup *group)
-{
-	const PrivilegeDescription *p;
-
-	p = privilege_search (oobs_group_get_name (group));
-	if (p == NULL) /* Ignore groups that don't match a privilege */
-		return;
-
-	gtk_list_store_insert_with_values (privileges_model, NULL, G_MAXINT,
-	                                   COL_MEMBER, FALSE,
-	                                   COL_DESCRIPTION, (p) ? _(p->privilege) : NULL,
-	                                   COL_GROUP, group,
-	                                   -1);
-}
-
-void
-privileges_table_set_from_user (OobsUser *user)
-{
-	GtkTreeIter iter;
-	gboolean valid;
-	OobsGroup *group;
-	GList *users;
-
-	valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (privileges_model), &iter);
-
-	while (valid) {
-		gtk_tree_model_get (GTK_TREE_MODEL (privileges_model), &iter,
-				    COL_GROUP, &group,
-				    -1);
-
-		users = oobs_group_get_users (group);
-		gtk_list_store_set (privileges_model, &iter,
-				    COL_MEMBER, (g_list_find (users, user) != NULL),
-				    -1);
-		g_list_free (users);
-		g_object_unref (group);
-		valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (privileges_model), &iter);
-	}
-}
-
-static gboolean
-find_group_in_profile (OobsGroup      *group,
-		       GstUserProfile *profile)
-{
-	gchar **groups;
-	const gchar *name;
-
-	if (!profile->groups)
-		return FALSE;
-
-	groups = profile->groups;
-	name = oobs_group_get_name (group);
-
-	while (*groups) {
-		if (strcmp (*groups, name) == 0)
-			return TRUE;
-
-		groups++;
-	}
-
-	return FALSE;
-}
-
-void
-privileges_table_set_from_profile (GstUserProfile *profile)
-{
-	GtkTreeIter iter;
-	gboolean valid;
-	OobsGroup *group;
-
-	valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (privileges_model), &iter);
-
-	while (valid) {
-		gtk_tree_model_get (GTK_TREE_MODEL (privileges_model), &iter,
-				    COL_GROUP, &group,
-				    -1);
-
-		gtk_list_store_set (privileges_model, &iter,
-				    COL_MEMBER, find_group_in_profile (group, profile),
-				    -1);
-
-		g_object_unref (group);
-		valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (privileges_model), &iter);
-	}
-}
-
-void
-privileges_table_save (OobsUser *user)
-{
-	GtkTreeIter iter;
-	OobsGroup *group;
-	gboolean valid, member;
-
-	valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (privileges_model), &iter);
-
-	while (valid) {
-		gtk_tree_model_get (GTK_TREE_MODEL (privileges_model), &iter,
-				    COL_GROUP, &group,
-				    COL_MEMBER, &member,
-				    -1);
-		if (member)
-			oobs_group_add_user (group, user);
-		else
-			oobs_group_remove_user (group, user);
-
-		valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (privileges_model), &iter);
-	}
-}
-
-void
-privileges_table_clear (void)
-{
-	gtk_list_store_clear (privileges_model);
-}

=== removed directory '.pc/26_user_profiles_conf.patch'
=== removed directory '.pc/26_user_profiles_conf.patch/src'
=== removed directory '.pc/26_user_profiles_conf.patch/src/users'
=== removed file '.pc/26_user_profiles_conf.patch/src/users/user-profiles.conf.in'
--- .pc/26_user_profiles_conf.patch/src/users/user-profiles.conf.in	2011-12-16 17:08:20 +0000
+++ .pc/26_user_profiles_conf.patch/src/users/user-profiles.conf.in	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-[Desktop]
-_Name=Desktop user
-_Description=Can perform common tasks. Can't install software or change settings affecting all users.
-Default=1
-Groups=cdrom,floppy,dialout,tape,dip,adm,plugdev,fax,audio,scanner,fuse,video
-
-[Administrator]
-_Name=Administrator
-_Description=Can change anything on the system, including installing and upgrading software.
-Groups=cdrom,floppy,dialout,tape,dip,adm,plugdev,fax,audio,scanner,fuse,admin,sambashare,lpadmin,video

=== removed directory '.pc/61_outdated_docs.patch'
=== removed directory '.pc/61_outdated_docs.patch/doc'
=== removed directory '.pc/61_outdated_docs.patch/doc/services'
=== removed file '.pc/61_outdated_docs.patch/doc/services/Makefile.am'
--- .pc/61_outdated_docs.patch/doc/services/Makefile.am	2011-12-16 17:08:20 +0000
+++ .pc/61_outdated_docs.patch/doc/services/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-include $(top_srcdir)/gnome-doc-utils.make
-dist-hook: doc-dist-hook
-
-DOC_MODULE = services-admin
-DOC_ENTITIES = legal.xml
-DOC_INCLUDES = 
-DOC_FIGURES = \
-	figures/services-tool.png
-
-DOC_LINGUAS = ca cs de el en_GB es fr gl oc pl pt_BR sl sv it zh_CN
-
-# this isn't still ported to gnome-doc-utils
-SUBDIRS = nl 
-
--include $(top_srcdir)/git.mk

=== removed directory '.pc/61_outdated_docs.patch/doc/time'
=== removed file '.pc/61_outdated_docs.patch/doc/time/Makefile.am'
--- .pc/61_outdated_docs.patch/doc/time/Makefile.am	2011-12-16 17:08:20 +0000
+++ .pc/61_outdated_docs.patch/doc/time/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-include $(top_srcdir)/gnome-doc-utils.make
-dist-hook: doc-dist-hook
-
-DOC_MODULE = time-admin
-DOC_ENTITIES = legal.xml
-DOC_INCLUDES = 
-DOC_FIGURES = \
-	figures/time-map.png		\
-	figures/time-servers.png	\
-	figures/time-tool-automatic.png	\
-	figures/time-tool-manual.png
-
-DOC_LINGUAS = ca cs de el en_GB es fr gl it oc pt_BR ru sl sv zh_CN
-
-# This isn't still ported to gnome-doc-utils
-SUBDIRS = nl
-
--include $(top_srcdir)/git.mk

=== removed directory '.pc/62_no_gettext.patch'
=== removed file '.pc/62_no_gettext.patch/configure.in'
--- .pc/62_no_gettext.patch/configure.in	2011-12-16 17:08:20 +0000
+++ .pc/62_no_gettext.patch/configure.in	1970-01-01 00:00:00 +0000
@@ -1,350 +0,0 @@
-AC_PREREQ(2.60)
-AC_INIT(gnome-system-tools, 3.0.0, http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-system-tools)
-AC_CONFIG_SRCDIR(src/common/gst-tool.c)
-AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
-m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
-
-IT_PROG_INTLTOOL([0.35.0])
-
-AM_CONFIG_HEADER(config.h)
-
-GNOME_DOC_INIT
-
-AM_MAINTAINER_MODE
-
-dnl Checking the above
-AC_CONFIG_SRCDIR(src/common/gst-tool.c)
-
-AM_PROG_LIBTOOL
-
-AC_ISC_POSIX
-AC_PROG_CC
-AM_PROG_CC_STDC
-AC_HEADER_STDC
-AC_PROG_INSTALL
-AC_PROG_MAKE_SET
-
-dnl glib-genmarshal
-AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
-
-GLIB_GSETTINGS
-
-STB_REQUIRED=2.10.1
-LIBOOBS_REQUIRED=2.91.1
-GTK_REQUIRED=2.91
-GLIB_REQUIRED=2.25.3
-DBUS_REQUIRED=0.32
-POLKIT_REQUIRED=0.97
-
-dnl =====================================================
-dnl Cracklib checking
-dnl =====================================================
-
-dnl AC_CHECK_LIB(crack, FascistCheck, ,[
-dnl   AC_MSG_WARN()
-dnl   AC_MSG_WARN(---------- Building without cracklib is not recommended. ----------)
-dnl   AC_MSG_WARN()
-dnl   AC_MSG_WARN(-- If you are looking for cracklib you can try  :)
-dnl   AC_MSG_WARN(--    http://www.users.dircon.co.uk/~crypto/)
-dnl   AC_MSG_WARN(--    or :)
-dnl   AC_MSG_WARN(--    http://www.rpmfind.net/linux/rpm2html/search.php?query=cracklib)
-dnl   AC_MSG_WARN(--    or :)
-dnl   AC_MSG_WARN(--    apt-get install cracklib2-dev)
-dnl   AC_MSG_WARN()])
-dnl if test x"$HAVE_LIBCRACK" = xyes ; then
-dnl   AC_CHECK_HEADER(crack.h, ,[
-dnl   AC_MSG_ERROR(cracklib crack.h header file not found.)])
-dnl fi
-
-dnl GST_CRACK_LIB_LOCATION="/usr/lib/"
-dnl AC_ARG_WITH(cracklib-dict,
-dnl [  --with-cracklib-dict[=DIR]       specify a cracklib dir ],[
-dnl   if test "$withval" != "no"; then
-dnl     GST_CRACK_LIB_LOCATION=$withval
-dnl   fi
-dnl ])
-dnl AC_SUBST(GST_CRACK_LIB_LOCATION)
-dnl GST_CRACK_LIB_CFLAGS="-DGST_CRACK_LIB_DICT_PATH=\"\\\"\$(GST_CRACK_LIB_LOCATION)\\\"\""
-dnl AC_SUBST(GST_CRACK_LIB_CFLAGS)
-
-dnl =====================================================
-dnl END: Cracklib checking
-dnl =====================================================
-
-dnl =====================================================
-dnl Check for Module versions
-dnl =====================================================
-
-PKG_CHECK_MODULES(GST_DEPENDS,[
-			   gtk+-3.0 >= $GTK_REQUIRED
-			   gmodule-export-2.0
-			   gio-2.0 >= $GLIB_REQUIRED
-			   pango
-			   liboobs-1 >= $LIBOOBS_REQUIRED
-			   system-tools-backends-2.0 >= $STB_REQUIRED
-			   ])
-
-PKG_CHECK_MODULES(DBUS,[
-		  dbus-1 >= $DBUS_REQUIRED
-		  ])
-
-DBUS_CFLAGS="$DBUS_CFLAGS -DDBUS_API_SUBJECT_TO_CHANGE"
-AC_SUBST(DBUS_LIBS)
-AC_SUBST(DBUS_CFLAGS)
-
-dnl PolicyKit support
-
-have_polkit=no
-AC_ARG_ENABLE(polkit,
-	AS_HELP_STRING([--enable-polkit],[Enable PolicyKit support (default yes)]),
-	[], [enable_polkit=yes])
-
-if test "x$enable_polkit" = "xyes"; then
-	PKG_CHECK_MODULES(POLKIT,[polkit-gobject-1 >= $POLKIT_REQUIRED], have_polkit=yes)
-
-	if test "$have_polkit" = "yes"; then
-		AC_DEFINE(HAVE_POLKIT, [1], [whether polkit was found])
-	else
-		AC_MSG_ERROR([PolicyKit support requested but policykit-1 not found])
-	fi
-fi
-
-AC_SUBST(POLKIT_LIBS)
-AC_SUBST(POLKIT_CFLAGS)
-AM_CONDITIONAL(HAVE_POLKIT, test x$have_polkit = xyes)
-
-
-dnl =====================================================
-dnl END: Check for Module versions
-dnl =====================================================
-
-dnl =====================================================
-dnl Check for GST Modules to build
-dnl =====================================================
-
-
-AC_ARG_ENABLE(network,
-	      [  --enable-network        Enable build network module (default yes)], , 
-	      enable_network=yes)
-AC_ARG_ENABLE(services,
-	      [  --enable-services       Enable build services module (default yes)], , 
-	      enable_services=yes)
-AC_ARG_ENABLE(time,
-	      [  --enable-time           Enable build time module (default yes)], , 
-	      enable_time=yes)
-AC_ARG_ENABLE(users,
-	      [  --enable-users          Enable build users module (default yes)], , 
-	      enable_users=yes)
-AC_ARG_ENABLE(shares,
-	      [  --enable-shares         Enable build shares module (default yes)], , 
-	      enable_shares=yes)
-AC_ARG_ENABLE(nautilus,
-	      [  --enable-nautilus         Enable build nautilus shares module (default yes)], , 
-	      enable_nautilus=yes)
-
-AM_CONDITIONAL(BUILD_NETWORK, test x$enable_network = xyes)
-AM_CONDITIONAL(BUILD_SERVICES, test x$enable_services = xyes)
-AM_CONDITIONAL(BUILD_TIME, test x$enable_time = xyes)
-AM_CONDITIONAL(BUILD_USERS, test x$enable_users = xyes)
-AM_CONDITIONAL(BUILD_SHARES, test x$enable_shares = xyes)
-AM_CONDITIONAL(BUILD_NAUTILUS, test x$enable_nautilus = xyes)
-
-dnl =====================================================
-dnl END: Check for GST Modules to build
-dnl =====================================================
-
-dnl ========================================================
-dnl Translations
-dnl ========================================================
-
-AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.17])
-GETTEXT_PACKAGE=gnome-system-tools
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [gettext package name])
-AC_SUBST([GETTEXT_PACKAGE], GETTEXT_PACKAGE)
-
-dnl ========================================================
-dnl END : Translations
-dnl ========================================================
-
-
-dnl =====================================================
-dnl GST_LIBS & GST_CFLAGS 
-dnl =====================================================
-
-
-#### gcc warning flags (taken from PolicyKit-gnome)
-
-if test "x$GCC" = "xyes"; then
-  changequote(,)dnl
-  case " $CFLAGS " in
-  *[\ \	]-Wall[\ \	]*) ;;
-  *) CFLAGS="$CFLAGS -Wall" ;;
-  esac
-
-  case " $CFLAGS " in
-  *[\ \	]-Wchar-subscripts[\ \	]*) ;;
-  *) CFLAGS="$CFLAGS -Wchar-subscripts" ;;
-  esac
-
-  case " $CFLAGS " in
-  *[\ \	]-Wmissing-declarations[\ \	]*) ;;
-  *) CFLAGS="$CFLAGS -Wmissing-declarations" ;;
-  esac
-
-  case " $CFLAGS " in
-  *[\ \	]-Wnested-externs[\ \	]*) ;;
-  *) CFLAGS="$CFLAGS -Wnested-externs" ;;
-  esac
-
-  case " $CFLAGS " in
-  *[\ \	]-Wpointer-arith[\ \	]*) ;;
-  *) CFLAGS="$CFLAGS -Wpointer-arith" ;;
-  esac
-
-  case " $CFLAGS " in
-  *[\ \	]-Wcast-align[\ \	]*) ;;
-  *) CFLAGS="$CFLAGS -Wcast-align" ;;
-  esac
-
-  case " $CFLAGS " in
-  *[\ \	]-Wsign-compare[\ \	]*) ;;
-  *) CFLAGS="$CFLAGS -Wsign-compare" ;;
-  esac
-
-  case " $CFLAGS " in
-  *[\ \	]-Wformat[\ \	]*) ;;
-  *) CFLAGS="$CFLAGS -Wformat" ;;
-  esac
-
-  case " $CFLAGS " in
-  *[\ \	]-Wformat-security[\ \	]*) ;;
-  *) CFLAGS="$CFLAGS -Wformat-security" ;;
-  esac
-
-  changequote([,])dnl
-fi
-
-dnl GST_DEPRECATED_FLAGS="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED"
-GST_DEPRECATED_FLAGS=""
-
-GST_LIBS="$GST_DEPENDS_LIBS $POLKIT_LIBS"
-GST_CFLAGS="$GST_DEPENDS_CFLAGS $POLKIT_CFLAGS $GST_DEPRECATED_FLAGS"
-
-GST_TOOL_LIBS="\$(top_builddir)/src/common/libsetuptool.a $GST_LIBS"
-GST_TOOL_CFLAGS="-I\$(top_srcdir)/src/common $GST_CFLAGS"
-
-GST_TOOL_CLEANFILES="\$(desktop) \$(desktop).in"
-GST_TOOL_EXTRA_DIST="\$(toolpixmaps) \$(desktop).in.in" 
-GST_TOOL_DEPENDENCIES="\$(top_builddir)/src/common/libsetuptool.a"
-
-AC_SUBST(GST_LIBS)
-AC_SUBST(GST_CFLAGS)
-AC_SUBST(GST_TOOL_LIBS)
-AC_SUBST(GST_TOOL_CFLAGS)
-AC_SUBST(GST_TOOL_CLEANFILES)
-AC_SUBST(GST_TOOL_EXTRA_DIST)
-AC_SUBST(GST_TOOL_DEPENDENCIES)
-
-dnl ==================================
-dnl END: GST_LIBS & GST_FLAGS
-dnl ==================================
-
-dnl ==================================
-dnl LIBIW DETECTION
-dnl ==================================
-
-GST_IW_LIBS=
-AC_CHECK_HEADER(iwlib.h, [
-  enable_libiw=yes
-  AC_DEFINE(HAVE_LIBIW_H, "", [whether libiw is available])
-  AC_HAVE_LIBRARY(iw, [GST_IW_LIBS="-liw"])
-])
-AM_CONDITIONAL(HAVE_LIBIW_H, test x$enable_libiw = xyes)
-AC_SUBST(GST_IW_LIBS)
-
-dnl ==================================
-dnl END: LIBIW DETECTION
-dnl ==================================
-
-dnl ===========================
-dnl NAUTILUS EXTENSION
-dnl ===========================
-
-if test "x$enable_nautilus" = "xyes"; then
-	PKG_CHECK_MODULES(NAUTILUS,[
-		   libnautilus-extension >= 2.9.3
-		   liboobs-1 >= $LIBOOBS_REQUIRED
-		   gio-2.0   >= $GLIB_REQUIRED
-		   ])
-fi
-
-AC_SUBST(NAUTILUS_LIBS)
-AC_SUBST(NAUTILUS_CFLAGS)
-
-dnl Determine the install dir for nautilus extension.
-NAUTILUSDIR=`pkg-config --variable=extensiondir libnautilus-extension`
-AC_SUBST(NAUTILUSDIR)
-
-dnl ===========================
-dnl END: NAUTILUS EXTENSION
-dnl ===========================
-
-AC_OUTPUT([
-Makefile
-doc/Makefile
-doc/network/Makefile
-doc/services/Makefile
-doc/services/nl/Makefile
-doc/shares/Makefile
-doc/time/Makefile
-doc/time/nl/Makefile
-doc/users/Makefile
-icons/Makefile
-icons/16x16/Makefile
-icons/16x16/apps/Makefile
-icons/22x22/Makefile
-icons/22x22/apps/Makefile
-icons/24x24/Makefile
-icons/24x24/apps/Makefile
-icons/32x32/Makefile
-icons/32x32/apps/Makefile
-icons/48x48/Makefile
-icons/48x48/apps/Makefile
-icons/48x48/devices/Makefile
-icons/scalable/Makefile
-icons/scalable/apps/Makefile
-interfaces/Makefile
-pixmaps/Makefile
-src/Makefile
-src/common/Makefile
-src/users/users.desktop.in
-src/users/Makefile
-src/network/network.desktop.in
-src/network/Makefile
-src/time/time.desktop.in
-src/time/Makefile
-src/time/e-map/Makefile
-src/services/services.desktop.in
-src/services/Makefile
-src/shares/shares.desktop.in
-src/shares/Makefile
-src/shares/nautilus/Makefile
-po/Makefile.in
-gnome-system-tools.pc
-])
-
-echo "
-
-Configuration (GST):
-	Services tool:     ${enable_services}
-	Users tool:        ${enable_users}
-	Network tool:      ${enable_network}
-	Time tool:         ${enable_time}
-	Shares tool:       ${enable_shares}
-	Nautilus support:  ${enable_nautilus}
-	Use PolicyKit:     ${have_polkit}
-
-	Compiler:          ${CC}
-"

=== removed directory '.pc/80_gst-packages-common.patch'
=== removed directory '.pc/80_gst-packages-common.patch/src'
=== removed directory '.pc/80_gst-packages-common.patch/src/common'
=== removed file '.pc/80_gst-packages-common.patch/src/common/Makefile.am'
--- .pc/80_gst-packages-common.patch/src/common/Makefile.am	2011-12-16 17:08:20 +0000
+++ .pc/80_gst-packages-common.patch/src/common/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-include $(top_srcdir)/DirsMakefile
-
-noinst_LIBRARIES = libsetuptool.a
-
-INCLUDES += \
-	$(GST_CFLAGS) \
-	-DDATADIR=\""$(datadir)"\" \
-	-DLIBDIR=\""$(libdir)"\" \
-	-DSYSCONFDIR=\""$(sysconfdir)"\" \
-	-DPREFIX=\""$(prefix)"\" \
-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"
-
-libsetuptool_a_SOURCES = \
-	gst-dialog.c		gst-dialog.h \
-	gst-tool.c		gst-tool.h \
-	gst-platform-dialog.c	gst-platform-dialog.h \
-	gst-filter.c		gst-filter.h \
-	gst-service-role.c	gst-service-role.h \
-	gst.h
-
-if HAVE_POLKIT
-libsetuptool_a_SOURCES += \
-	um-lockbutton.c		um-lockbutton.h
-endif
-
-EXTRA_DIST = CommonMakefile $(headers)
-
--include $(top_srcdir)/git.mk

=== removed file '.pc/80_gst-packages-common.patch/src/common/gst-package.c'
=== removed file '.pc/80_gst-packages-common.patch/src/common/gst-package.h'
=== removed file '.pc/80_gst-packages-common.patch/src/common/gst.h'
--- .pc/80_gst-packages-common.patch/src/common/gst.h	2010-09-01 18:17:22 +0000
+++ .pc/80_gst-packages-common.patch/src/common/gst.h	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#include <config.h>
-#include "gst-tool.h"
-#include "gst-dialog.h"
-#include "gst-filter.h"
-#include "gst-service-role.h"

=== removed directory '.pc/81_gst-packages-shares-admin.patch'
=== removed directory '.pc/81_gst-packages-shares-admin.patch/src'
=== removed directory '.pc/81_gst-packages-shares-admin.patch/src/shares'
=== removed file '.pc/81_gst-packages-shares-admin.patch/src/shares/shares-tool.c'
--- .pc/81_gst-packages-shares-admin.patch/src/shares/shares-tool.c	2010-05-31 16:48:21 +0000
+++ .pc/81_gst-packages-shares-admin.patch/src/shares/shares-tool.c	1970-01-01 00:00:00 +0000
@@ -1,240 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Copyright (C) 2004 Carlos Garnacho
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- *
- * Authors: Carlos Garnacho Parro <[e-mail]>.
- */
-
-#include <glib-object.h>
-#include "shares-tool.h"
-#include "users-table.h"
-#include <glib/gi18n.h>
-#include "gst.h"
-
-static void gst_shares_tool_class_init (GstSharesToolClass *class);
-static void gst_shares_tool_init       (GstSharesTool      *tool);
-static void gst_shares_tool_finalize   (GObject            *object);
-
-static GObject * gst_shares_tool_constructor (GType                  type,
-					      guint                  n_construct_properties,
-					      GObjectConstructParam *construct_params);
-
-static void gst_shares_tool_update_gui    (GstTool         *tool);
-static void gst_shares_tool_update_config (GstTool         *tool);
-
-static void gst_shares_tool_update_services_availability (GstSharesTool *tool);
-
-G_DEFINE_TYPE (GstSharesTool, gst_shares_tool, GST_TYPE_TOOL);
-
-static void
-gst_shares_tool_class_init (GstSharesToolClass *class)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (class);
-	GstToolClass *tool_class = GST_TOOL_CLASS (class);
-
-	object_class->constructor = gst_shares_tool_constructor;
-	object_class->finalize = gst_shares_tool_finalize;
-	tool_class->update_gui = gst_shares_tool_update_gui;
-	tool_class->update_config = gst_shares_tool_update_config;
-}
-
-static void
-gst_shares_tool_init (GstSharesTool *tool)
-{
-	GstTool *gst_tool = GST_TOOL (tool);
-
-	tool->nfs_config = oobs_nfs_config_get ();
-	gst_tool_add_configuration_object (gst_tool, tool->nfs_config, TRUE);
-
-	tool->smb_config = oobs_smb_config_get ();
-	gst_tool_add_configuration_object (gst_tool, tool->smb_config, TRUE);
-
-	tool->services_config = oobs_services_config_get ();
-	gst_tool_add_configuration_object (gst_tool, tool->services_config, TRUE);
-
-	tool->hosts_config = oobs_hosts_config_get ();
-	gst_tool_add_configuration_object (gst_tool, tool->hosts_config, TRUE);
-
-	tool->users_config = oobs_users_config_get ();
-	gst_tool_add_configuration_object (gst_tool, tool->users_config, TRUE);
-}
-
-static GObject *
-gst_shares_tool_constructor (GType                  type,
-			     guint                  n_construct_properties,
-			     GObjectConstructParam *construct_params)
-{
-	GObject *object;
-
-	object = (* G_OBJECT_CLASS (gst_shares_tool_parent_class)->constructor) (type,
-										 n_construct_properties,
-										 construct_params);
-	users_table_create (GST_TOOL (object));
-
-	return object;
-}
-
-static void
-gst_shares_tool_finalize (GObject *object)
-{
-	GstSharesTool *tool = GST_SHARES_TOOL (object);
-
-	if (tool->nfs_config)
-		g_object_unref (tool->nfs_config);
-
-	(* G_OBJECT_CLASS (gst_shares_tool_parent_class)->finalize) (object);
-}
-
-static void
-add_shares (OobsList *list)
-{
-	OobsListIter iter;
-	OobsShare *share;
-	gboolean valid;
-
-	valid = oobs_list_get_iter_first (list, &iter);
-
-	while (valid) {
-		share = OOBS_SHARE (oobs_list_get (list, &iter));
-
-		table_add_share (share, &iter);
-		g_object_unref (share);
-		valid = oobs_list_iter_next (list, &iter);
-	}
-}
-
-static void
-update_global_smb_config (GstTool       *tool,
-			  OobsSMBConfig *config)
-{
-	GtkWidget *widget;
-	const gchar *str;
-	gboolean is_wins_server;
-
-	str = oobs_smb_config_get_workgroup (config);
-	widget = gst_dialog_get_widget (tool->main_dialog, "smb_workgroup");
-	gtk_entry_set_text (GTK_ENTRY (widget), (str) ? str : "");
-
-	is_wins_server = oobs_smb_config_get_is_wins_server (config);
-	widget = gst_dialog_get_widget (tool->main_dialog, "smb_is_wins");
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), is_wins_server);
-		
-	str = oobs_smb_config_get_wins_server (config);
-	widget = gst_dialog_get_widget (tool->main_dialog, "smb_wins_server");
-	gtk_entry_set_text (GTK_ENTRY (widget), (str) ? str : "");
-}
-
-static gboolean
-check_servers (GstSharesTool *tool)
-{
-	GtkWidget *dialog;
-
-	if (tool->smb_available || tool->nfs_available)
-		return TRUE;
-
-	dialog = gtk_message_dialog_new (GTK_WINDOW (GST_TOOL (tool)->main_dialog),
-					 GTK_DIALOG_MODAL,
-					 GTK_MESSAGE_WARNING,
-					 GTK_BUTTONS_CLOSE,
-					 _("Sharing services are not installed"));
-	gtk_message_dialog_format_secondary_markup (GTK_MESSAGE_DIALOG (dialog),
-						    _("You need to install at least either Samba or NFS "
-						      "in order to share your folders."));
-	gtk_dialog_run (GTK_DIALOG (dialog));
-	gtk_widget_destroy (dialog);
-
-	return FALSE;
-}
-
-static void
-gst_shares_tool_update_gui (GstTool *tool)
-{
-	GstSharesTool *shares_tool;
-	GtkWidget *dialog_notebook;
-	OobsList *list;
-
-	shares_tool = GST_SHARES_TOOL (tool);
-	dialog_notebook = gst_dialog_get_widget (tool->main_dialog, "shares_admin");
-
-	if (check_servers (shares_tool)) {
-		table_clear ();
-
-		list  = oobs_nfs_config_get_shares (OOBS_NFS_CONFIG (shares_tool->nfs_config));
-		add_shares (list);
-
-		list = oobs_smb_config_get_shares (OOBS_SMB_CONFIG (shares_tool->smb_config));
-		add_shares (list);
-
-		update_global_smb_config (tool, OOBS_SMB_CONFIG (shares_tool->smb_config));
-		gtk_widget_set_sensitive (dialog_notebook, TRUE);
-	} else {
-		/* disable the tool UI, there's no way to add shares */
-		gtk_widget_set_sensitive (dialog_notebook, FALSE);
-	}
-
-	users_table_set_config (shares_tool);
-
-	if (shares_tool->path) {
-		gst_tool_authenticate (tool, GST_SHARES_TOOL (tool)->smb_config);
-		gst_tool_authenticate (tool, GST_SHARES_TOOL (tool)->nfs_config);
-		share_settings_dialog_run (shares_tool->path, TRUE);
-	}
-}
-
-static void
-gst_shares_tool_update_config (GstTool *tool)
-{
-	GstSharesTool *shares_tool;
-
-	shares_tool = GST_SHARES_TOOL (tool);
-	gst_shares_tool_update_services_availability (shares_tool);
-}
-
-static void
-gst_shares_tool_update_services_availability (GstSharesTool *tool)
-{
-	OobsList *services;
-	OobsListIter iter;
-	GObject *service;
-	gboolean valid;
-	GstServiceRole role;
-
-	services = oobs_services_config_get_services (OOBS_SERVICES_CONFIG (tool->services_config));
-	valid = oobs_list_get_iter_first (services, &iter);
-
-	while (valid) {
-		service = oobs_list_get (services, &iter);
-		role = gst_service_get_role (OOBS_SERVICE (service));
-
-		if (role == GST_ROLE_FILE_SERVER_SMB)
-			tool->smb_available = TRUE;
-		else if (role == GST_ROLE_FILE_SERVER_NFS)
-			tool->nfs_available = TRUE;
-
-		g_object_unref (service);
-		valid = oobs_list_iter_next (services, &iter);
-	}
-}
-
-GstSharesTool*
-gst_shares_tool_new (void)
-{
-	return g_object_new (GST_TYPE_SHARES_TOOL,
-			     "name", "shares",
-			     "title", _("Shared Folders"),
-			     "icon", "folder-remote",
-			     NULL);
-}

=== removed directory '.pc/82_gst-packages-time-admin.patch'
=== removed directory '.pc/82_gst-packages-time-admin.patch/src'
=== removed directory '.pc/82_gst-packages-time-admin.patch/src/time'
=== removed file '.pc/82_gst-packages-time-admin.patch/src/time/time-tool.c'
--- .pc/82_gst-packages-time-admin.patch/src/time/time-tool.c	2011-12-16 17:08:20 +0000
+++ .pc/82_gst-packages-time-admin.patch/src/time/time-tool.c	1970-01-01 00:00:00 +0000
@@ -1,774 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * Copyright (C) 2005 Carlos Garnacho.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- *
- * Authors: Carlos Garnacho Parro <[e-mail]>
- */
-
-#include <glib.h>
-#include <glib/gi18n.h>
-#include <dbus/dbus.h>
-#include "time-tool.h"
-#include "gst.h"
-#include "ntp-servers-list.h"
-
-#define GST_TIME_TOOL_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GST_TYPE_TIME_TOOL, GstTimeToolPrivate))
-#define APPLY_CONFIG_TIMEOUT 2000
-
-#define SCREENSAVER_SERVICE "org.gnome.ScreenSaver"
-#define SCREENSAVER_PATH "/org/gnome/ScreenSaver"
-#define SCREENSAVER_INTERFACE "org.gnome.ScreenSaver"
-
-typedef struct _GstTimeToolPrivate GstTimeToolPrivate;
-
-struct _GstTimeToolPrivate {
-	guint clock_timeout;
-	guint apply_timeout;
-
-	guint configuration_changed_id;
-
-	DBusConnection *bus_connection;
-	gint cookie;
-};
-
-enum {
-	CONFIGURATION_AUTOMATIC,
-	CONFIGURATION_MANUAL
-};
-
-enum {
-	COL_TEXT,
-	COL_WIDGET,
-	COL_LAST
-};
-
-static void  gst_time_tool_class_init     (GstTimeToolClass *class);
-static void  gst_time_tool_init           (GstTimeTool      *tool);
-static void  gst_time_tool_finalize       (GObject          *object);
-
-static GObject *gst_time_tool_constructor (GType                  type,
-					   guint                  n_construct_properties,
-					   GObjectConstructParam *construct_params);
-static void  gst_time_tool_update_gui     (GstTool *tool);
-static void  gst_time_tool_update_config  (GstTool *tool);
-static void  gst_time_tool_close          (GstTool *tool);
-
-static void  on_option_configuration_changed (GtkWidget   *widget,
-					      GstTimeTool *time_tool);
-
-
-G_DEFINE_TYPE (GstTimeTool, gst_time_tool, GST_TYPE_TOOL);
-
-static void
-gst_time_tool_class_init (GstTimeToolClass *class)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (class);
-	GstToolClass *tool_class = GST_TOOL_CLASS (class);
-	
-	object_class->constructor = gst_time_tool_constructor;
-	object_class->finalize = gst_time_tool_finalize;
-	tool_class->update_gui = gst_time_tool_update_gui;
-	tool_class->update_config = gst_time_tool_update_config;
-	tool_class->close = gst_time_tool_close;
-
-	g_type_class_add_private (object_class,
-				  sizeof (GstTimeToolPrivate));
-}
-
-static void
-get_ntp_service (GstTimeTool *tool)
-{
-	GObject *service;
-	OobsList *list;
-	OobsListIter iter;
-	gboolean valid;
-	GstServiceRole role;
-
-	list = oobs_services_config_get_services (OOBS_SERVICES_CONFIG (tool->services_config));
-	valid = oobs_list_get_iter_first (list, &iter);
-
-	while (valid) {
-		service = oobs_list_get (list, &iter);
-		role = gst_service_get_role (OOBS_SERVICE (service));
-
-		if (role == GST_ROLE_NTP_SERVER)
-			tool->ntp_service = g_object_ref (service);
-
-		g_object_unref (service);
-		valid = oobs_list_iter_next (list, &iter);
-	}
-}
-
-static void
-gst_time_tool_init (GstTimeTool *tool)
-{
-	DBusError error;
-	GstTimeToolPrivate *priv = GST_TIME_TOOL_GET_PRIVATE (tool);
-
-	dbus_error_init (&error);
-	priv->bus_connection = dbus_bus_get (DBUS_BUS_SESSION, &error);
-	priv->cookie = 0;
-
-	if (dbus_error_is_set (&error)) {
-		g_warning ("%s", error.message);
-		dbus_error_free (&error);
-	}
-
-	tool->time_config = oobs_time_config_get ();
-	gst_tool_add_configuration_object (GST_TOOL (tool), tool->time_config, TRUE);
-
-	tool->ntp_config = oobs_ntp_config_get ();
-	gst_tool_add_configuration_object (GST_TOOL (tool), tool->ntp_config, TRUE);
-
-	tool->services_config = oobs_services_config_get ();
-	gst_tool_add_configuration_object (GST_TOOL (tool), tool->services_config, TRUE);
-}
-
-static void
-inhibit_screensaver (GstTimeTool *tool,
-		     gboolean     inhibit)
-{
-	GstTimeToolPrivate *priv = GST_TIME_TOOL_GET_PRIVATE (tool);
-	DBusMessage *message, *reply;
-	DBusMessageIter iter;
-
-	if (!priv->bus_connection)
-		return;
-
-	if (inhibit) {
-		const gchar *appname = "Time-admin";
-		const gchar *reason = "Changing time";
-
-		g_return_if_fail (priv->cookie == 0);
-
-		message = dbus_message_new_method_call (SCREENSAVER_SERVICE,
-							SCREENSAVER_PATH,
-							SCREENSAVER_INTERFACE,
-							"Inhibit");
-		/* set args */
-		dbus_message_iter_init_append (message, &iter);
-		dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &appname);
-		dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &reason);
-
-		reply = dbus_connection_send_with_reply_and_block (priv->bus_connection, message, -1, NULL);
-
-		if (reply) {
-			/* get cookie */
-			dbus_message_iter_init (reply, &iter);
-			dbus_message_iter_get_basic (&iter, &priv->cookie);
-			dbus_message_unref (reply);
-		}
-
-		dbus_message_unref (message);
-	} else if (!inhibit && priv->cookie != 0) {
-		message = dbus_message_new_method_call (SCREENSAVER_SERVICE,
-							SCREENSAVER_PATH,
-							SCREENSAVER_INTERFACE,
-							"UnInhibit");
-		/* set args */
-		dbus_message_iter_init_append (message, &iter);
-		dbus_message_iter_append_basic (&iter, DBUS_TYPE_INT32, &priv->cookie);
-
-		dbus_connection_send (priv->bus_connection, message, NULL);
-		dbus_message_unref (message);
-
-		priv->cookie = 0;
-	}
-}
-
-static gboolean
-on_apply_timeout (GstTimeTool *tool)
-{
-	guint year, month, day, hour, minute, second;
-
-	gtk_calendar_get_date (GTK_CALENDAR (tool->calendar), &year, &month, &day);
-	hour   = (guint) gtk_spin_button_get_value (GTK_SPIN_BUTTON (tool->hours));
-	minute = (guint) gtk_spin_button_get_value (GTK_SPIN_BUTTON (tool->minutes));
-	second = (guint) gtk_spin_button_get_value (GTK_SPIN_BUTTON (tool->seconds));
-
-	inhibit_screensaver (tool, TRUE);
-
-	oobs_time_config_set_time (OOBS_TIME_CONFIG (tool->time_config),
-				   (gint) year, (gint) month, (gint) day,
-				   (gint) hour, (gint) minute, (gint)second);
-
-	gst_tool_commit (GST_TOOL (tool), tool->time_config);
-	gst_time_tool_start_clock (tool);
-
-	inhibit_screensaver (tool, FALSE);
-
-	return FALSE;
-}
-
-static void
-update_apply_timeout (GstTimeTool *tool)
-{
-	GstTimeToolPrivate *priv = GST_TIME_TOOL_GET_PRIVATE (tool);
-
-	gst_time_tool_stop_clock (tool);
-
-	if (priv->apply_timeout) {
-		g_source_remove (priv->apply_timeout);
-		priv->apply_timeout = 0;
-	}
-
-	priv->apply_timeout = g_timeout_add (APPLY_CONFIG_TIMEOUT, (GSourceFunc) on_apply_timeout, tool);
-}
-
-static void
-on_value_changed (GtkWidget *widget, gpointer data)
-{
-	gint value;
-	gchar *str;
-
-	value = gtk_spin_button_get_value (GTK_SPIN_BUTTON (widget));
-	str = g_strdup_printf ("%02d", (gint) value);
-
-	gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), value);
-	gtk_entry_set_text (GTK_ENTRY (widget), str);
-	g_free (str);
-}
-
-static void
-on_editable_changed (GtkWidget *widget, gpointer data)
-{
-	update_apply_timeout (GST_TIME_TOOL (data));
-}
-
-#define is_leap_year(yyy) ((((yyy % 4) == 0) && ((yyy % 100) != 0)) || ((yyy % 400) == 0));
-
-static void
-change_calendar (GtkWidget *calendar, gint increment)
-{
-	gint day, month, year;
-	gint days_in_month;
-	gboolean leap_year;
-
-	static const gint month_length[2][13] = {
-		{ 0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 },
-		{ 0, 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }
-	};
-
-	gtk_calendar_get_date (GTK_CALENDAR (calendar),
-			       (guint*) &year, (guint*) &month, (guint*) &day);
-
-	leap_year = is_leap_year (year);
-	days_in_month = month_length [leap_year][month+1];
-
-	if (increment != 0) {
-		day += increment;
-
-		if (day < 1) {
-			day = month_length [leap_year][month] + day;
-			month--;
-		} else if (day > days_in_month) {
-			day -= days_in_month;
-			month++;
-		}
-
-		if (month < 0) {
-			year--;
-			leap_year = is_leap_year (year);
-			month = 11;
-			day = month_length [leap_year][month+1];
-		} else if (month > 11) {
-			year++;
-			leap_year = is_leap_year (year);
-			month = 0;
-			day = 1;
-		}
-
-		gtk_calendar_select_month (GTK_CALENDAR (calendar),
-					   month, year);
-		gtk_calendar_select_day (GTK_CALENDAR (calendar),
-					 day);
-	}
-}
-
-static void
-on_spin_button_wrapped (GtkWidget *widget, gpointer data)
-{
-	GstTimeTool *tool = GST_TIME_TOOL (data);
-	gint value = gtk_spin_button_get_value (GTK_SPIN_BUTTON (widget));
-
-	if (widget == tool->seconds)
-		gtk_spin_button_spin (GTK_SPIN_BUTTON (tool->minutes),
-				      (value == 0) ? GTK_SPIN_STEP_FORWARD : GTK_SPIN_STEP_BACKWARD, 1);
-	else if (widget == tool->minutes)
-		gtk_spin_button_spin (GTK_SPIN_BUTTON (tool->hours),
-				      (value == 0) ? GTK_SPIN_STEP_FORWARD : GTK_SPIN_STEP_BACKWARD, 1);
-	else if (widget == tool->hours)
-		change_calendar (tool->calendar, (value == 0) ? 1 : -1);
-}
-
-static void
-on_calendar_day_selected (GtkWidget *widget, gpointer data)
-{
-	update_apply_timeout (GST_TIME_TOOL (data));
-}
-
-static GtkWidget*
-prepare_spin_button (GstTool *tool, const gchar *widget_name)
-{
-	GtkWidget *widget;
-
-	widget = gst_dialog_get_widget (tool->main_dialog, widget_name);
-
-	g_signal_connect (G_OBJECT (widget), "changed",
-			  G_CALLBACK (on_editable_changed), tool);
-	g_signal_connect (G_OBJECT (widget), "wrapped",
-			  G_CALLBACK (on_spin_button_wrapped), tool);
-	/*
-	g_signal_connect (G_OBJECT (widget), "value-changed",
-			  G_CALLBACK (on_value_changed), tool);
-	*/
-
-	return widget;
-}
-
-void
-init_timezone (GstTimeTool *time_tool)
-{
-	GstTool *tool = GST_TOOL (time_tool);
-	GtkWidget *w;
-	GPtrArray *locs;
-	guint i;
-
-	time_tool->tzmap = e_tz_map_new (tool);
-	g_return_if_fail (time_tool->tzmap != NULL);
-	
-	w = gst_dialog_get_widget (tool->main_dialog, "map_window");
-	gtk_container_add (GTK_CONTAINER (w), GTK_WIDGET (time_tool->tzmap->map));
-	gtk_widget_show (GTK_WIDGET (time_tool->tzmap->map));
-
-	w = gst_dialog_get_widget (tool->main_dialog, "location_combo");
-	locs = tz_get_locations (e_tz_map_get_tz_db (time_tool->tzmap));
-
-	for (i = 0; i < locs->len; i++)
-		gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (w),
-		                                tz_location_get_zone (g_ptr_array_index (locs, i)));
-
-	time_tool->timezone_dialog = gst_dialog_get_widget (tool->main_dialog, "time_zone_window");
-}
-
-static gboolean
-check_ntp_support (GstTool  *tool)
-{
-	GstTimeToolPrivate *priv = GST_TIME_TOOL_GET_PRIVATE (tool);
-	GtkWidget *message, *widget;
-
-	if (GST_TIME_TOOL (tool)->ntp_service)
-		return TRUE;
-	else {
-		/* Be sure we take into account newly installed NTP support */
-		oobs_object_update (OOBS_OBJECT (GST_TIME_TOOL (tool)->services_config));
-		get_ntp_service (GST_TIME_TOOL (tool));
-
-		if (GST_TIME_TOOL (tool)->ntp_service)
-			return TRUE;
-	}
-
-	widget = gst_dialog_get_widget (tool->main_dialog, "configuration_options");
-	g_signal_handler_block (widget, priv->configuration_changed_id);
-	gtk_combo_box_set_active (GTK_COMBO_BOX (widget), CONFIGURATION_MANUAL);
-	g_signal_handler_unblock (widget, priv->configuration_changed_id);
-
-	message = gtk_message_dialog_new (GTK_WINDOW (tool->main_dialog),
-					  GTK_DIALOG_MODAL,
-					  GTK_MESSAGE_INFO,
-					  GTK_BUTTONS_CLOSE,
-					  _("NTP support is not installed"));
-	gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (message),
-						  _("Please install and activate NTP support in the system to enable "
-						    "synchronization of your local time server with "
-						    "internet time servers."));
-	gtk_dialog_run (GTK_DIALOG (message));
-	gtk_widget_destroy (message);
-
-	return FALSE;
-}
-
-static void
-on_option_configuration_changed (GtkWidget *widget,
-				 GstTimeTool *time_tool)
-{
-	gint option;
-	gboolean active;
-
-	option = gtk_combo_box_get_active (GTK_COMBO_BOX (widget));
-	active = (option == CONFIGURATION_AUTOMATIC);
-
-	if (check_ntp_support (GST_TOOL (time_tool))) {
-		const OobsServicesRunlevel *runlevel;
-
-		runlevel = oobs_services_config_get_default_runlevel (OOBS_SERVICES_CONFIG (time_tool->services_config));
-		oobs_service_set_runlevel_configuration (time_tool->ntp_service,
-							 (OobsServicesRunlevel *) runlevel,
-							 (active) ? OOBS_SERVICE_START : OOBS_SERVICE_STOP,
-							 0);
-
-		gst_tool_commit_async (GST_TOOL (time_tool), OOBS_OBJECT (time_tool->ntp_service),
-				       (active) ? _("Enabling NTP") : _("Disabling NTP"),
-				       NULL, NULL);
-	}
-}
-
-static void
-on_synchronize_now_clicked (GtkWidget *widget, gpointer data)
-{
-	GstTimeTool *tool;
-
-	tool = GST_TIME_TOOL (data);
-	gst_tool_commit_async (GST_TOOL (tool), tool->ntp_config,
-			       _("Synchronizing system clock"), NULL, NULL);
-}
-
-static void
-on_option_changed (GtkWidget   *combo,
-		   GstTimeTool *time_tool)
-{
-	GtkTreeModel *model;
-	GtkTreeIter iter;
-	GtkWidget *widget, *container;
-	gint option;
-
-	if (!gtk_combo_box_get_active_iter (GTK_COMBO_BOX (combo), &iter))
-		return;
-
-	option = gtk_combo_box_get_active (GTK_COMBO_BOX (combo));
-	model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo));
-	gtk_tree_model_get (model, &iter,
-			    COL_WIDGET, &widget,
-			    -1);
-
-	container = gst_dialog_get_widget (GST_TOOL (time_tool)->main_dialog, "configuration_container");
-
-	/* remove the child */
-	if (gtk_bin_get_child (GTK_BIN (container)))
-		gtk_container_remove (GTK_CONTAINER (container), gtk_bin_get_child (GTK_BIN (container)));
-
-	gtk_container_add (GTK_CONTAINER (container), widget);
-	gtk_widget_show (container);
-}
-
-static void
-add_option (GstTool      *tool,
-	    GtkListStore *store,
-	    const gchar  *text,
-	    const gchar  *widget)
-{
-	GtkTreeIter iter;
-	GtkWidget *w, *toplevel;
-
-	w = gst_dialog_get_widget (tool->main_dialog, widget);
-	toplevel = gtk_widget_get_toplevel (w);
-
-	g_object_ref (w);
-	gtk_container_remove (GTK_CONTAINER (gtk_widget_get_parent (w)), w);
-	gtk_widget_destroy (toplevel);
-
-	gtk_list_store_append (store, &iter);
-	gtk_list_store_set (store, &iter,
-			    COL_TEXT, text,
-			    COL_WIDGET, w,
-			    -1);
-}
-
-static void
-set_cell_layout (GtkCellLayout *combo)
-{
-	GtkCellRenderer *renderer;
-
-	renderer = gtk_cell_renderer_text_new ();
-
-	gtk_cell_layout_clear (combo);
-	gtk_cell_layout_pack_start (combo, renderer, TRUE);
-	gtk_cell_layout_set_attributes (combo, renderer,
-					"text", COL_TEXT,
-					NULL);
-}
-
-static void
-add_options_combo (GstTimeTool *time_tool)
-{
-	GstTimeToolPrivate *priv = GST_TIME_TOOL_GET_PRIVATE (time_tool);
-	GstTool *tool = GST_TOOL (time_tool);
-	GtkWidget *combo;
-	GtkListStore *store;
-
-	combo = gst_dialog_get_widget (tool->main_dialog, "configuration_options");
-	store = gtk_list_store_new (COL_LAST, G_TYPE_STRING, GTK_TYPE_WIDGET);
-
-	gtk_combo_box_set_model (GTK_COMBO_BOX (combo), GTK_TREE_MODEL (store));
-	add_option (tool, store, _("Keep synchronized with Internet servers"), "automatic_configuration");
-	add_option (tool, store, _("Manual"), "manual_configuration");
-	g_object_unref (store);
-
-	set_cell_layout (GTK_CELL_LAYOUT (combo));
-	g_signal_connect_after (combo, "changed",
-				G_CALLBACK (on_option_changed), time_tool);
-
-	priv->configuration_changed_id =
-		g_signal_connect (combo, "changed",
-				  G_CALLBACK (on_option_configuration_changed), time_tool);
-}
-
-static GObject*
-gst_time_tool_constructor (GType                  type,
-			   guint                  n_construct_properties,
-			   GObjectConstructParam *construct_params)
-{
-	GObject *object;
-	GstTimeTool *time_tool;
-
-	object = (* G_OBJECT_CLASS (gst_time_tool_parent_class)->constructor) (type,
-									       n_construct_properties,
-									       construct_params);
-	time_tool = GST_TIME_TOOL (object);
-	time_tool->map_hover_label = gst_dialog_get_widget (GST_TOOL (time_tool)->main_dialog, "location_label");
-	time_tool->hours    = prepare_spin_button (GST_TOOL (time_tool), "hours");
-	time_tool->minutes  = prepare_spin_button (GST_TOOL (time_tool), "minutes");
-	time_tool->seconds  = prepare_spin_button (GST_TOOL (time_tool), "seconds");
-
-	time_tool->calendar = gst_dialog_get_widget (GST_TOOL (time_tool)->main_dialog, "calendar");
-
-	g_signal_connect (G_OBJECT (time_tool->calendar), "day-selected",
-			  G_CALLBACK (on_calendar_day_selected), time_tool);
-
-	time_tool->ntp_list = ntp_servers_list_get (time_tool);
-	init_timezone (time_tool);
-	add_options_combo (time_tool);
-
-	time_tool->synchronize_now = gst_dialog_get_widget (GST_TOOL (time_tool)->main_dialog, "update_time");
-	g_signal_connect (G_OBJECT (time_tool->synchronize_now), "clicked",
-			  G_CALLBACK (on_synchronize_now_clicked), time_tool);
-
-	gtk_window_set_resizable (GTK_WINDOW (GST_TOOL (time_tool)->main_dialog), FALSE);
-
-	return object;
-}
-
-static void
-gst_time_tool_finalize (GObject *object)
-{
-	GstTimeTool *tool = GST_TIME_TOOL (object);
-
-	/* FIXME: missing things to free */
-	g_object_unref (tool->time_config);
-
-	(* G_OBJECT_CLASS (gst_time_tool_parent_class)->finalize) (object);
-}
-
-static void
-update_servers_list (GstTimeTool *tool)
-{
-	OobsList *list;
-	OobsListIter iter;
-	GObject *server;
-	gboolean valid;
-
-	/* FIXME: restore NTP servers to NULL */
-	list = oobs_ntp_config_get_servers (OOBS_NTP_CONFIG (tool->ntp_config));
-	valid = oobs_list_get_iter_first (list, &iter);
-
-	while (valid) {
-		server = oobs_list_get (list, &iter);
-		ntp_servers_list_check (GST_TIME_TOOL (tool)->ntp_list,
-					&iter, OOBS_NTP_SERVER (server));
-
-		g_object_unref (server);
-		valid = oobs_list_iter_next (list, &iter);
-	}
-}
-
-static void
-gst_time_tool_update_gui (GstTool *tool)
-{
-	GstTimeTool *time_tool = GST_TIME_TOOL (tool);
-	GstTimeToolPrivate *priv = GST_TIME_TOOL_GET_PRIVATE (time_tool);
-	GtkWidget *timezone, *configuration_options, *timeserver_button;
-	gint option = CONFIGURATION_MANUAL;
-	OobsServiceStatus active;
-
-	gst_time_tool_start_clock (GST_TIME_TOOL (tool));
-	timezone = gst_dialog_get_widget (tool->main_dialog, "tzlabel");
-	configuration_options = gst_dialog_get_widget (tool->main_dialog, "configuration_options");
-	timeserver_button = gst_dialog_get_widget (tool->main_dialog, "timeserver_button");
-
-	gtk_label_set_text (GTK_LABEL (timezone),
-			    oobs_time_config_get_timezone (OOBS_TIME_CONFIG (time_tool->time_config)));
-
-	update_servers_list (GST_TIME_TOOL (tool));
-
-	if (time_tool->ntp_service) {
-		const OobsServicesRunlevel *runlevel;
-
-		runlevel = oobs_services_config_get_default_runlevel (OOBS_SERVICES_CONFIG (time_tool->services_config));
-		oobs_service_get_runlevel_configuration (time_tool->ntp_service, (OobsServicesRunlevel *) runlevel, &active, NULL);
-
-		if (active == OOBS_SERVICE_START)
-			option = CONFIGURATION_AUTOMATIC;
-	}
-
-	g_signal_handler_block (configuration_options, priv->configuration_changed_id);
-	gtk_combo_box_set_active (GTK_COMBO_BOX (configuration_options), option);
-	g_signal_handler_unblock (configuration_options, priv->configuration_changed_id);
-}
-
-static void
-gst_time_tool_update_config (GstTool *tool)
-{
-	get_ntp_service (GST_TIME_TOOL (tool));
-}
-
-static void
-gst_time_tool_close (GstTool *tool)
-{
-	GstTimeToolPrivate *priv = GST_TIME_TOOL_GET_PRIVATE (tool);
-
-	if (priv->apply_timeout) {
-		/* disable timeout and apply changes
-		 * immediately, the tool is closing! */
-		g_source_remove (priv->apply_timeout);
-		priv->apply_timeout = 0;
-		on_apply_timeout (GST_TIME_TOOL (tool));
-	}
-
-	gst_time_tool_stop_clock (GST_TIME_TOOL (tool));
-
-	(* GST_TOOL_CLASS (gst_time_tool_parent_class)->close) (tool);
-}
-
-GstTool*
-gst_time_tool_new (void)
-{
-	return g_object_new (GST_TYPE_TIME_TOOL,
-			     "name", "time",
-			     "title", _("Time and Date Settings"),
-			     "icon", "time-admin",
-			     NULL);
-}
-
-static void
-freeze_clock (GstTimeTool *tool)
-{
-	g_signal_handlers_block_by_func (tool->hours,   on_editable_changed, tool);
-	g_signal_handlers_block_by_func (tool->minutes, on_editable_changed, tool);
-	g_signal_handlers_block_by_func (tool->seconds, on_editable_changed, tool);
-	g_signal_handlers_block_by_func (tool->calendar, on_calendar_day_selected, tool);
-}
-
-static void
-thaw_clock (GstTimeTool *tool)
-{
-	g_signal_handlers_unblock_by_func (tool->hours,   on_editable_changed, tool);
-	g_signal_handlers_unblock_by_func (tool->minutes, on_editable_changed, tool);
-	g_signal_handlers_unblock_by_func (tool->seconds, on_editable_changed, tool);
-	g_signal_handlers_unblock_by_func (tool->calendar, on_calendar_day_selected, tool);
-}
-
-void
-gst_time_tool_update_clock (GstTimeTool *tool)
-{
-	gint year, month, day, hour, minute, second;
-
-	oobs_time_config_get_time (OOBS_TIME_CONFIG (tool->time_config),
-				   &year, &month,  &day,
-				   &hour, &minute, &second);
-
-	freeze_clock (tool);
-
-	gtk_calendar_select_month (GTK_CALENDAR (tool->calendar), month, year);
-	gtk_calendar_select_day   (GTK_CALENDAR (tool->calendar), day);
-
-	gtk_spin_button_set_value (GTK_SPIN_BUTTON (tool->hours),   (gfloat) hour);
-	gtk_spin_button_set_value (GTK_SPIN_BUTTON (tool->minutes), (gfloat) minute);
-	gtk_spin_button_set_value (GTK_SPIN_BUTTON (tool->seconds), (gfloat) second);
-
-	thaw_clock (tool);
-}
-
-static gboolean
-clock_tick (gpointer data)
-{
-	GstTimeTool *tool = (GstTimeTool *) data;
-
-	gst_time_tool_update_clock (tool);
-
-	return TRUE;
-}
-
-void
-gst_time_tool_start_clock (GstTimeTool *tool)
-{
-	GstTimeToolPrivate *priv = GST_TIME_TOOL_GET_PRIVATE (tool);
-
-	if (!priv->clock_timeout) {
-		/* Do a preliminary update, just for showing
-		   something with sense in the gui immediatly */
-		gst_time_tool_update_clock (tool);
-
-		priv->clock_timeout = g_timeout_add (1000, (GSourceFunc) clock_tick, tool);
-	}
-}
-
-void
-gst_time_tool_stop_clock (GstTimeTool *tool)
-{
-	GstTimeToolPrivate *priv = GST_TIME_TOOL_GET_PRIVATE (tool);
-
-	if (priv->clock_timeout) {
-		g_source_remove (priv->clock_timeout);
-		priv->clock_timeout = 0;
-	}
-}
-
-void
-gst_time_tool_run_timezone_dialog (GstTimeTool *time_tool)
-{
-	GstTool *tool;
-	GtkWidget *label;
-	const gchar *timezone;
-	gchar *tz_name = NULL;
-	TzLocation *tz_location;
-
-	tool  = GST_TOOL (time_tool);
-	label = gst_dialog_get_widget (tool->main_dialog, "tzlabel");
-
-	timezone = oobs_time_config_get_timezone (OOBS_TIME_CONFIG (time_tool->time_config));
-	e_tz_map_set_tz_from_name (time_tool->tzmap, timezone);
-
-	gtk_window_set_transient_for (GTK_WINDOW (time_tool->timezone_dialog),
-				      GTK_WINDOW (tool->main_dialog));
-
-	gst_dialog_add_edit_dialog (tool->main_dialog, time_tool->timezone_dialog);
-
-	gtk_widget_show (time_tool->timezone_dialog);
-	gtk_dialog_run (GTK_DIALOG (time_tool->timezone_dialog));
-	gtk_widget_hide (time_tool->timezone_dialog);
-
-	gst_dialog_remove_edit_dialog (tool->main_dialog, time_tool->timezone_dialog);
-
-	tz_name     = e_tz_map_get_selected_tz_name (time_tool->tzmap);
-	tz_location = e_tz_map_get_location_by_name (time_tool->tzmap, tz_name);
-
-	if (!timezone || strcmp (tz_name, timezone) != 0) {
-		oobs_time_config_set_timezone (OOBS_TIME_CONFIG (time_tool->time_config), tz_name);
-		gst_tool_commit (GST_TOOL (time_tool), time_tool->time_config);
-		gtk_label_set_text (GTK_LABEL (label), tz_name);
-	}
-}

=== removed directory '.pc/91_shares_services_detection.patch'
=== removed directory '.pc/91_shares_services_detection.patch/src'
=== removed directory '.pc/91_shares_services_detection.patch/src/shares'
=== removed file '.pc/91_shares_services_detection.patch/src/shares/shares-tool.c'
--- .pc/91_shares_services_detection.patch/src/shares/shares-tool.c	2011-12-16 17:08:20 +0000
+++ .pc/91_shares_services_detection.patch/src/shares/shares-tool.c	1970-01-01 00:00:00 +0000
@@ -1,293 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Copyright (C) 2004 Carlos Garnacho
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- *
- * Authors: Carlos Garnacho Parro <[e-mail]>.
- */
-
-#include <glib-object.h>
-#include "shares-tool.h"
-#include "users-table.h"
-#include <glib/gi18n.h>
-#include "gst.h"
-
-static void gst_shares_tool_class_init (GstSharesToolClass *class);
-static void gst_shares_tool_init       (GstSharesTool      *tool);
-static void gst_shares_tool_finalize   (GObject            *object);
-
-static GObject * gst_shares_tool_constructor (GType                  type,
-					      guint                  n_construct_properties,