diff options
118 files changed, 170 insertions, 3184 deletions
@@ -1,3 +1,19 @@ +2001-07-05 Bradford Hovinen <hovinen@ximian.com> + + * capplets/Makefile.am: Removed rules pertaining to + sound-properties + + * capplets/sound-properties-capplet.c (set_moniker_cb): Change + BonoboPropertyEditor to BonoboPEditor + + * configure.in: Update AC_INIT to use correct directory name + (AC_OUTPUT): Update to current directory structure + + * Makefile.am (SUBDIRS): Update to current directory structure + + * capplets/Makefile.am (always_built_SUBDIRS): Updated to current + directory structure + 2001-07-03 Bradford Hovinen <hovinen@ximian.com> * archiver/Makefile.am (bonobo_moniker_archiver_LDADD): Use @...@ diff --git a/Makefile.am b/Makefile.am index 50b4b01db..527365ce5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = intl po capplets root-manager new-control-center archiver +SUBDIRS = intl po archiver capplets root-manager control-center EXTRA_DIST = control-center.spec.in diff --git a/archiver/ChangeLog b/archiver/ChangeLog index 6d6155afb..1887565c8 100644 --- a/archiver/ChangeLog +++ b/archiver/ChangeLog @@ -1,3 +1,16 @@ +2001-07-05 Bradford Hovinen <hovinen@ximian.com> + + * bonobo-moniker-archiver.c (archiver_resolve): Update call to + Bonobo_ConfigDatabase_addDatabase + + * bonobo-config-archiver.h: Fix include directories + + * Makefile.am (INCLUDES): Update to use pkg-config standards; add + BONOBO_CFLAGS + Include configuration moniker-related material + (SUBDIRS): Remove + (bin_PROGRAMS): Added ximian-archiver + 2001-07-02 Tambet Ingo <tambet@ximian.com> * default-global.xml: Added display-conf backend. diff --git a/archiver/Makefile.am b/archiver/Makefile.am index 432dbdd06..859abe1c9 100644 --- a/archiver/Makefile.am +++ b/archiver/Makefile.am @@ -1,5 +1,3 @@ -SUBDIRS = . location-manager-capplet - confexecdir = $(libdir) confexec_DATA = ximian_archiverConf.sh @@ -9,33 +7,32 @@ Locationmeta_DATA = default-user.xml default-global.xml includedir = $(prefix)/include/ximian-archiver INCLUDES = \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - -I$(includedir) $(GNOME_INCLUDEDIR) \ - -DVERSION=\""$(VERSION)"\" \ - -DG_LOG_DOMAIN=\"libximian-archiver\" \ - -DCONFIGDIR=\""/etc"\" \ - -DLOCATION_DIR=\""$(datadir)/ximian-setup-tools/archiver"\" \ - -DGLADE_DIR=\""$(INTERFACES_DIR)"\" \ + -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ + -I$(includedir) \ + $(GNOME_INCLUDEDIR) \ + -DVERSION=\""$(VERSION)"\" \ + -DG_LOG_DOMAIN=\"libximian-archiver\" \ + -DCONFIGDIR=\""/etc"\" \ + -DLOCATION_DIR=\""$(datadir)/ximian-setup-tools/archiver"\" \ + -DGLADE_DIR=\""$(INTERFACES_DIR)"\" \ -DXST_BACKEND_LOCATION=\""$(datadir)/ximian-setup-tools/scripts"\" \ - $(GNOME_XML_CFLAGS) \ - $(LIBGLADE_CFLAGS) + @ARCHIVER_CFLAGS@ \ + @MONIKER_CFLAGS@ -bin_PROGRAMS = ximian-archiver +bin_PROGRAMS = bonobo-moniker-archiver ximian-archiver lib_LTLIBRARIES = libximian_archiver.la libximian_archiver_la_SOURCES = \ archive.c archive.h \ location.c location.h \ config-log.c config-log.h \ - create-location-dialog.c create-location-dialog.h \ - location-list.c location-list.h \ backend-list.c backend-list.h \ cluster.c cluster.h \ cluster-location.c cluster-location.h \ - config-manager-dialog.c config-manager-dialog.h \ util.c util.h -libximian_archiver_la_LIBADD = $(XIMIAN_ARCHIVER_LIBS) +libximian_archiver_la_LIBADD = \ + @GNOME_XML_LIBS@ include_HEADERS = \ archive.h \ @@ -52,14 +49,10 @@ ximian_archiver_SOURCES = \ ximian_archiver_LDADD = \ $(GNOME_LIBDIR) \ $(GNOMEUI_LIBS) \ - $(INTLLIBS) \ - $(GNOME_XML_LIB) \ + $(INTLLIBS) \ + @ARCHIVER_LIBS@ \ libximian_archiver.la -EXTRA_DIST = \ - $(Locationmeta_DATA) \ - ximian_archiverConf.sh.in - # # Create the ximian_archiverConf.sh file from the sh.in file # @@ -71,4 +64,29 @@ ximian_archiverConf.sh: ximian_archiverConf.sh.in Makefile < $(srcdir)/ximian_archiverConf.sh.in > ximian_archiverConf.tmp \ && mv ximian_archiverConf.tmp ximian_archiverConf.sh +OAF_FILES = \ + Bonobo_Moniker_archiver.oaf + +oafdir = $(datadir)/oaf +oaf_DATA = $(OAF_FILES) + +monikerdir = $(libdir)/bonobo/monikers +Bonobo_Moniker_archiver.oaf : $(srcdir)/Bonobo_Moniker_archiver.oaf.in $(top_builddir)/config.status + sed -e "s|\@MONIKER_LIBDIR\@|$(monikerdir)|" \ + $(srcdir)/Bonobo_Moniker_archiver.oaf.in > Bonobo_Moniker_archiver.oaf + +clean-local: + -rm -f $(OAF_FILES) + +bonobo_moniker_archiver_SOURCES = \ + bonobo-config-archiver.c \ + bonobo-config-archiver.h \ + bonobo-moniker-archiver.c + +bonobo_moniker_archiver_LDADD = @MONIKER_LIBS@ libximian_archiver.la + +EXTRA_DIST = \ + $(Locationmeta_DATA) \ + ximian_archiverConf.sh.in \ + Bonobo_Moniker_archiver.oaf.in diff --git a/archiver/config-manager-dialog.c b/archiver/config-manager-dialog.c deleted file mode 100644 index 475904242..000000000 --- a/archiver/config-manager-dialog.c +++ /dev/null @@ -1,625 +0,0 @@ -/* -*- mode: c; style: linux -*- */ - -/* config-manager-dialog.c - * Copyright (C) 2000-2001 Ximian, Inc. - * - * Written by Bradford Hovinen <hovinen@ximian.com> - * - * 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, 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. - */ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#include <time.h> - -#include <glade/glade.h> - -#include "config-manager-dialog.h" -#include "create-location-dialog.h" -#include "archive.h" -#include "location.h" -#include "backend-list.h" -#include "location-list.h" - -#define WID(str) (glade_xml_get_widget (dialog->p->config_dialog_data, str)) - -enum { - ARG_0, - ARG_TYPE -}; - -struct _ConfigManagerDialogPrivate -{ - GladeXML *config_dialog_data; - - CMDialogType type; - - struct tm *date; - gboolean rollback_all; - gchar *backend_id; - gchar *selected_location_id; - - Archive *global_archive; - Archive *user_archive; - - BackendList *global_list; - BackendList *user_list; - - Location *current_global; - Location *current_user; - - LocationList *location_list; -}; - -static GnomeDialogClass *parent_class; - -static void config_manager_dialog_init (ConfigManagerDialog *dialog); -static void config_manager_dialog_class_init (ConfigManagerDialogClass *class); - -static void config_manager_dialog_set_arg (GtkObject *object, - GtkArg *arg, - guint arg_id); -static void config_manager_dialog_get_arg (GtkObject *object, - GtkArg *arg, - guint arg_id); - -static void config_manager_dialog_finalize (GtkObject *object); - -static void ok_cb (GtkWidget *widget, - ConfigManagerDialog *dialog); -static void apply_cb (GtkWidget *widget, - ConfigManagerDialog *dialog); -static void cancel_cb (GtkWidget *widget, - ConfigManagerDialog *dialog); -static void time_count_changed_cb (GtkSpinButton *button, - ConfigManagerDialog *dialog); -static void rollback_all_toggled_cb (GtkToggleButton *button, - ConfigManagerDialog *dialog); -static void rollback_one_toggled_cb (GtkToggleButton *button, - ConfigManagerDialog *dialog); -static void backend_select_cb (GtkMenuItem *menu_item, - ConfigManagerDialog *dialog); - -static void create_cb (GtkWidget *button, - ConfigManagerDialog *dialog); -static void rename_cb (GtkWidget *button, - ConfigManagerDialog *dialog); -static void destroy_cb (GtkWidget *button, - ConfigManagerDialog *dialog); -static void change_location_cb (GtkWidget *button, - ConfigManagerDialog *dialog); -static void edit_location_cb (GtkWidget *button, - ConfigManagerDialog *dialog); -static void real_create_cb (CreateLocationDialog - *create_dialog, - gchar *name, - Location *parent, - ConfigManagerDialog *dialog); - -static void do_rollback (ConfigManagerDialog *dialog); -static void reset_time (ConfigManagerDialog *dialog, - guint sub_days); -static gint populate_backends_cb (BackendList *list, - gchar *backend_id, - ConfigManagerDialog *dialog); -static void populate_backends_list (ConfigManagerDialog *dialog, - BackendList *list); - -static void set_backend_controls_sensitive (ConfigManagerDialog *dialog, - gboolean s); - -guint -config_manager_dialog_get_type (void) -{ - static guint config_manager_dialog_type = 0; - - if (!config_manager_dialog_type) { - GtkTypeInfo config_manager_dialog_info = { - "ConfigManagerDialog", - sizeof (ConfigManagerDialog), - sizeof (ConfigManagerDialogClass), - (GtkClassInitFunc) config_manager_dialog_class_init, - (GtkObjectInitFunc) config_manager_dialog_init, - (GtkArgSetFunc) NULL, - (GtkArgGetFunc) NULL - }; - - config_manager_dialog_type = - gtk_type_unique (gnome_dialog_get_type (), - &config_manager_dialog_info); - } - - return config_manager_dialog_type; -} - -static void -config_manager_dialog_init (ConfigManagerDialog *dialog) -{ - static char *buttons[] = { - GNOME_STOCK_BUTTON_OK, - GNOME_STOCK_BUTTON_APPLY, - GNOME_STOCK_BUTTON_CANCEL, - NULL - }; - - gnome_dialog_constructv (GNOME_DIALOG (dialog), - _("Rollback and Location Management"), - buttons); - - dialog->p = g_new0 (ConfigManagerDialogPrivate, 1); - dialog->p->config_dialog_data = - glade_xml_new (GLADE_DIR "/rollback-location-management.glade", - "config_dialog_data"); - - gtk_box_pack_start (GTK_BOX - (GNOME_DIALOG (dialog)->vbox), - WID ("config_dialog_data"), 0, TRUE, TRUE); - - gtk_window_set_policy (GTK_WINDOW (dialog), - TRUE, FALSE, TRUE); - - gnome_dialog_button_connect (GNOME_DIALOG (dialog), - 0, GTK_SIGNAL_FUNC (ok_cb), - dialog); - gnome_dialog_button_connect (GNOME_DIALOG (dialog), - 1, GTK_SIGNAL_FUNC (apply_cb), - dialog); - gnome_dialog_button_connect (GNOME_DIALOG (dialog), - 2, GTK_SIGNAL_FUNC (cancel_cb), - dialog); - - glade_xml_signal_connect_data (dialog->p->config_dialog_data, - "time_count_changed_cb", - time_count_changed_cb, - dialog); - glade_xml_signal_connect_data (dialog->p->config_dialog_data, - "rollback_all_toggled_cb", - rollback_all_toggled_cb, - dialog); - glade_xml_signal_connect_data (dialog->p->config_dialog_data, - "rollback_one_toggled_cb", - rollback_one_toggled_cb, - dialog); - glade_xml_signal_connect_data (dialog->p->config_dialog_data, - "create_cb", - create_cb, - dialog); - glade_xml_signal_connect_data (dialog->p->config_dialog_data, - "rename_cb", - rename_cb, - dialog); - glade_xml_signal_connect_data (dialog->p->config_dialog_data, - "destroy_cb", - destroy_cb, - dialog); - glade_xml_signal_connect_data (dialog->p->config_dialog_data, - "change_location_cb", - change_location_cb, - dialog); - glade_xml_signal_connect_data (dialog->p->config_dialog_data, - "edit_location_cb", - edit_location_cb, - dialog); - - dialog->p->rollback_all = TRUE; - dialog->p->date = g_new (struct tm, 1); - dialog->p->location_list = - LOCATION_LIST (location_list_new (FALSE, NULL, NULL)); - - gtk_widget_show (GTK_WIDGET (dialog->p->location_list)); - gtk_container_add (GTK_CONTAINER (WID ("location_tree_location")), - GTK_WIDGET (dialog->p->location_list)); - - set_backend_controls_sensitive (dialog, FALSE); - reset_time (dialog, 0); -} - -static void -config_manager_dialog_class_init (ConfigManagerDialogClass *class) -{ - GtkObjectClass *object_class; - - gtk_object_add_arg_type ("ConfigManagerDialog::type", - GTK_TYPE_INT, - GTK_ARG_CONSTRUCT_ONLY | GTK_ARG_READWRITE, - ARG_TYPE); - - object_class = GTK_OBJECT_CLASS (class); - object_class->finalize = config_manager_dialog_finalize; - object_class->set_arg = config_manager_dialog_set_arg; - object_class->get_arg = config_manager_dialog_get_arg; - - parent_class = GNOME_DIALOG_CLASS - (gtk_type_class (gnome_dialog_get_type ())); -} - -static void -config_manager_dialog_set_arg (GtkObject *object, GtkArg *arg, guint arg_id) -{ - ConfigManagerDialog *dialog; - - g_return_if_fail (object != NULL); - g_return_if_fail (IS_CONFIG_MANAGER_DIALOG (object)); - - dialog = CONFIG_MANAGER_DIALOG (object); - - switch (arg_id) { - case ARG_TYPE: - dialog->p->type = GTK_VALUE_INT (*arg); - - switch (dialog->p->type) { - case CM_DIALOG_USER_ONLY: - dialog->p->user_archive = - ARCHIVE (archive_load (FALSE)); - dialog->p->global_archive = NULL; - break; - - case CM_DIALOG_GLOBAL_ONLY: - dialog->p->global_archive = - ARCHIVE (archive_load (TRUE)); - dialog->p->user_archive = NULL; - break; - - case CM_DIALOG_BOTH: - dialog->p->user_archive = - ARCHIVE (archive_load (FALSE)); - dialog->p->global_archive = - ARCHIVE (archive_load (TRUE)); - break; - } - - if (dialog->p->user_archive != NULL) { - dialog->p->user_list = - archive_get_backend_list - (dialog->p->user_archive); - dialog->p->current_user = - archive_get_current_location - (dialog->p->user_archive); - populate_backends_list - (dialog, dialog->p->user_list); - } - - if (dialog->p->global_archive != NULL) { - dialog->p->global_list = - archive_get_backend_list - (dialog->p->global_archive); - dialog->p->current_global = - archive_get_current_location - (dialog->p->global_archive); - populate_backends_list - (dialog, dialog->p->global_list); - } - - gtk_object_set (GTK_OBJECT (dialog->p->location_list), - "user-archive", dialog->p->user_archive, - "global-archive", dialog->p->global_archive, - NULL); - - break; - - default: - g_warning ("Bad argument set"); - break; - } -} - -static void -config_manager_dialog_get_arg (GtkObject *object, GtkArg *arg, guint arg_id) -{ - ConfigManagerDialog *dialog; - - g_return_if_fail (object != NULL); - g_return_if_fail (IS_CONFIG_MANAGER_DIALOG (object)); - - dialog = CONFIG_MANAGER_DIALOG (object); - - switch (arg_id) { - case ARG_TYPE: - GTK_VALUE_INT (*arg) = dialog->p->type; - break; - - default: - g_warning ("Bad argument get"); - break; - } -} - -static void -config_manager_dialog_finalize (GtkObject *object) -{ - ConfigManagerDialog *dialog; - - g_return_if_fail (object != NULL); - g_return_if_fail (IS_CONFIG_MANAGER_DIALOG (object)); - - dialog = CONFIG_MANAGER_DIALOG (object); - - if (dialog->p->date != NULL) - g_free (dialog->p->date); - - if (dialog->p->type == CM_DIALOG_USER_ONLY || - dialog->p->type == CM_DIALOG_BOTH) - { - gtk_object_unref (GTK_OBJECT (dialog->p->current_user)); - gtk_object_unref (GTK_OBJECT (dialog->p->user_list)); - gtk_object_unref (GTK_OBJECT (dialog->p->user_archive)); - } - - if (dialog->p->type == CM_DIALOG_GLOBAL_ONLY || - dialog->p->type == CM_DIALOG_BOTH) - { - gtk_object_unref (GTK_OBJECT (dialog->p->current_global)); - gtk_object_unref (GTK_OBJECT (dialog->p->global_list)); - gtk_object_unref (GTK_OBJECT (dialog->p->global_archive)); - } - - g_free (dialog->p); - - GTK_OBJECT_CLASS (parent_class)->finalize (object); -} - -GtkWidget * -config_manager_dialog_new (CMDialogType type) -{ - return gtk_widget_new (config_manager_dialog_get_type (), - "type", type, - NULL); -} - -static void -ok_cb (GtkWidget *widget, ConfigManagerDialog *dialog) -{ - g_return_if_fail (dialog != NULL); - g_return_if_fail (IS_CONFIG_MANAGER_DIALOG (dialog)); - - do_rollback (dialog); - - gnome_dialog_close (GNOME_DIALOG (dialog)); -} - -static void -apply_cb (GtkWidget *widget, ConfigManagerDialog *dialog) -{ - g_return_if_fail (dialog != NULL); - g_return_if_fail (IS_CONFIG_MANAGER_DIALOG (dialog)); - - do_rollback (dialog); -} - -static void -cancel_cb (GtkWidget *widget, ConfigManagerDialog *dialog) -{ - g_return_if_fail (dialog != NULL); - g_return_if_fail (IS_CONFIG_MANAGER_DIALOG (dialog)); - - /* This little hack will trick the location manager into rolling back - * to the last known configuration - */ - g_free (dialog->p->date); - dialog->p->date = NULL; - do_rollback (dialog); - - gnome_dialog_close (GNOME_DIALOG (dialog)); -} - -static void -time_count_changed_cb (GtkSpinButton *button, ConfigManagerDialog *dialog) -{ - g_return_if_fail (dialog != NULL); - g_return_if_fail (IS_CONFIG_MANAGER_DIALOG (dialog)); - - reset_time (dialog, gtk_spin_button_get_value_as_int (button)); -} - -static void -rollback_all_toggled_cb (GtkToggleButton *button, ConfigManagerDialog *dialog) -{ - g_return_if_fail (dialog != NULL); - g_return_if_fail (IS_CONFIG_MANAGER_DIALOG (dialog)); - - if (gtk_toggle_button_get_active (button)) { - dialog->p->rollback_all = TRUE; - set_backend_controls_sensitive (dialog, FALSE); - } -} - -static void -rollback_one_toggled_cb (GtkToggleButton *button, ConfigManagerDialog *dialog) -{ - g_return_if_fail (dialog != NULL); - g_return_if_fail (IS_CONFIG_MANAGER_DIALOG (dialog)); - - if (gtk_toggle_button_get_active (button)) { - dialog->p->rollback_all = FALSE; - set_backend_controls_sensitive (dialog, TRUE); - } -} - -static void -backend_select_cb (GtkMenuItem *menu_item, ConfigManagerDialog *dialog) -{ - g_return_if_fail (dialog != NULL); - g_return_if_fail (IS_CONFIG_MANAGER_DIALOG (dialog)); - - dialog->p->backend_id = gtk_object_get_data (GTK_OBJECT (menu_item), - "backend-id"); -} - -static void -create_cb (GtkWidget *button, ConfigManagerDialog *dialog) -{ - CreateLocationDialog *create_dialog; - - g_return_if_fail (dialog != NULL); - g_return_if_fail (IS_CONFIG_MANAGER_DIALOG (dialog)); - - create_dialog = CREATE_LOCATION_DIALOG - (create_location_dialog_new (dialog->p->type)); - - gtk_signal_connect (GTK_OBJECT (create_dialog), - "create-location", - GTK_SIGNAL_FUNC (real_create_cb), - dialog); - - gtk_widget_show (GTK_WIDGET (create_dialog)); -} - -static void -rename_cb (GtkWidget *button, ConfigManagerDialog *dialog) -{ - g_return_if_fail (dialog != NULL); - g_return_if_fail (IS_CONFIG_MANAGER_DIALOG (dialog)); -} - -static void -destroy_cb (GtkWidget *button, ConfigManagerDialog *dialog) -{ - g_return_if_fail (dialog != NULL); - g_return_if_fail (IS_CONFIG_MANAGER_DIALOG (dialog)); -} - -static void -change_location_cb (GtkWidget *button, ConfigManagerDialog *dialog) -{ - g_return_if_fail (dialog != NULL); - g_return_if_fail (IS_CONFIG_MANAGER_DIALOG (dialog)); - - /* FIXME */ - archive_set_current_location (dialog->p->user_archive, - location_list_get_selected_location - (dialog->p->location_list)); -} - -static void -edit_location_cb (GtkWidget *button, ConfigManagerDialog *dialog) -{ - g_return_if_fail (dialog != NULL); - g_return_if_fail (IS_CONFIG_MANAGER_DIALOG (dialog)); -} - -static void -real_create_cb (CreateLocationDialog *create_dialog, gchar *name, - Location *parent, ConfigManagerDialog *dialog) -{ - g_return_if_fail (dialog != NULL); - g_return_if_fail (IS_CONFIG_MANAGER_DIALOG (dialog)); - - /* FIXME */ - location_new (dialog->p->user_archive, name, parent); - location_list_reread (dialog->p->location_list); -} - -static void -do_rollback (ConfigManagerDialog *dialog) -{ - switch (dialog->p->type) { - case CM_DIALOG_USER_ONLY: - if (dialog->p->rollback_all) - location_rollback_all_to - (dialog->p->current_user, - dialog->p->date, TRUE); - else - location_rollback_backend_to - (dialog->p->current_user, - dialog->p->date, - dialog->p->backend_id, TRUE); - break; - - case CM_DIALOG_GLOBAL_ONLY: - if (dialog->p->rollback_all) - location_rollback_all_to - (dialog->p->current_global, - dialog->p->date, TRUE); - else - location_rollback_backend_to - (dialog->p->current_global, - dialog->p->date, - dialog->p->backend_id, TRUE); - break; - - case CM_DIALOG_BOTH: - if (dialog->p->rollback_all) { - location_rollback_all_to - (dialog->p->current_global, - dialog->p->date, TRUE); - location_rollback_all_to - (dialog->p->current_user, - dialog->p->date, TRUE); - } - else if (backend_list_contains - (dialog->p->global_list, dialog->p->backend_id)) - { - location_rollback_backend_to - (dialog->p->current_global, - dialog->p->date, - dialog->p->backend_id, TRUE); - } else { - location_rollback_backend_to - (dialog->p->current_user, - dialog->p->date, - dialog->p->backend_id, TRUE); - } - - break; - } -} - -static void -reset_time (ConfigManagerDialog *dialog, guint sub_days) -{ - time_t current_time; - - time (¤t_time); - current_time -= sub_days * 24 * 60 * 60; - localtime_r (¤t_time, dialog->p->date); -} - -static gint -populate_backends_cb (BackendList *list, gchar *backend_id, - ConfigManagerDialog *dialog) -{ - GtkWidget *menu_item; - GtkWidget *menu; - - menu_item = gtk_menu_item_new_with_label (backend_id); - gtk_widget_show (menu_item); - gtk_object_set_data (GTK_OBJECT (menu_item), - "backend-id", backend_id); - gtk_signal_connect (GTK_OBJECT (menu_item), "activate", - GTK_SIGNAL_FUNC (backend_select_cb), dialog); - - menu = gtk_option_menu_get_menu - (GTK_OPTION_MENU (WID ("backend_select"))); - gtk_menu_append (GTK_MENU (menu), menu_item); - return 0; -} - -static void -populate_backends_list (ConfigManagerDialog *dialog, BackendList *list) -{ - backend_list_foreach (list, (BackendCB) populate_backends_cb, dialog); - - gtk_option_menu_set_history - (GTK_OPTION_MENU (WID ("backend_select")), 0); -} - -static void -set_backend_controls_sensitive (ConfigManagerDialog *dialog, gboolean s) -{ - gtk_widget_set_sensitive (WID ("backend_select"), s); -} diff --git a/archiver/config-manager-dialog.h b/archiver/config-manager-dialog.h deleted file mode 100644 index 792941cc4..000000000 --- a/archiver/config-manager-dialog.h +++ /dev/null @@ -1,63 +0,0 @@ -/* -*- mode: c; style: linux -*- */ - -/* config-manager-dialog.h - * Copyright (C) 2000-2001 Ximian, Inc. - * - * Written by Bradford Hovinen <hovinen@ximian.com> - * - * 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, 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. - */ - -#ifndef __CONFIG_MANAGER_DIALOG_H -#define __CONFIG_MANAGER_DIALOG_H - -#include <gnome.h> - -BEGIN_GNOME_DECLS - -#define CONFIG_MANAGER_DIALOG(obj) GTK_CHECK_CAST (obj, config_manager_dialog_get_type (), ConfigManagerDialog) -#define CONFIG_MANAGER_DIALOG_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, config_manager_dialog_get_type (), ConfigManagerDialogClass) -#define IS_CONFIG_MANAGER_DIALOG(obj) GTK_CHECK_TYPE (obj, config_manager_dialog_get_type ()) - -typedef struct _ConfigManagerDialog ConfigManagerDialog; -typedef struct _ConfigManagerDialogClass ConfigManagerDialogClass; -typedef struct _ConfigManagerDialogPrivate ConfigManagerDialogPrivate; - -typedef enum _CMDialogType CMDialogType; - -struct _ConfigManagerDialog -{ - GnomeDialog parent; - - ConfigManagerDialogPrivate *p; -}; - -struct _ConfigManagerDialogClass -{ - GnomeDialogClass gnome_dialog_class; -}; - -enum _CMDialogType { - CM_DIALOG_USER_ONLY, CM_DIALOG_GLOBAL_ONLY, CM_DIALOG_BOTH -}; - -guint config_manager_dialog_get_type (void); - -GtkWidget *config_manager_dialog_new (CMDialogType type); - -END_GNOME_DECLS - -#endif /* __CONFIG_MANAGER_DIALOG_H */ diff --git a/archiver/create-location-dialog.c b/archiver/create-location-dialog.c deleted file mode 100644 index e08757f23..000000000 --- a/archiver/create-location-dialog.c +++ /dev/null @@ -1,291 +0,0 @@ -/* -*- mode: c; style: linux -*- */ - -/* create-location-dialog.c - * Copyright (C) 2000-2001 Ximian, Inc. - * - * Written by Bradford Hovinen <hovinen@ximian.com> - * - * 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, 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. - */ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#include <glade/glade.h> - -#include "create-location-dialog.h" -#include "location-list.h" - -#define WID(str) (glade_xml_get_widget (dialog->p->create_dialog_data, str)) - -enum { - ARG_0, - ARG_TYPE -}; - -enum { - CREATE_LOCATION_SIGNAL, - LAST_SIGNAL -}; - -struct _CreateLocationDialogPrivate -{ - GladeXML *create_dialog_data; - - CMDialogType type; - - gchar *selected_location_id; - - Archive *global_archive; - Archive *user_archive; - - LocationList *location_list; -}; - -static GnomeDialogClass *parent_class; - -static guint create_location_dialog_signals[LAST_SIGNAL] = { 0 }; - -static void create_location_dialog_init (CreateLocationDialog *dialog); -static void create_location_dialog_class_init (CreateLocationDialogClass *class); - -static void create_location_dialog_set_arg (GtkObject *object, - GtkArg *arg, - guint arg_id); -static void create_location_dialog_get_arg (GtkObject *object, - GtkArg *arg, - guint arg_id); - -static void ok_cb (GtkWidget *widget, - CreateLocationDialog *dialog); -static void cancel_cb (GtkWidget *widget, - CreateLocationDialog *dialog); - -static void create_location_dialog_finalize (GtkObject *object); - -guint -create_location_dialog_get_type (void) -{ - static guint create_location_dialog_type = 0; - - if (!create_location_dialog_type) { - GtkTypeInfo create_location_dialog_info = { - "CreateLocationDialog", - sizeof (CreateLocationDialog), - sizeof (CreateLocationDialogClass), - (GtkClassInitFunc) create_location_dialog_class_init, - (GtkObjectInitFunc) create_location_dialog_init, - (GtkArgSetFunc) NULL, - (GtkArgGetFunc) NULL - }; - - create_location_dialog_type = - gtk_type_unique (gnome_dialog_get_type (), - &create_location_dialog_info); - } - - return create_location_dialog_type; -} - -static void -create_location_dialog_init (CreateLocationDialog *dialog) -{ - static char *buttons[] = { - GNOME_STOCK_BUTTON_OK, - GNOME_STOCK_BUTTON_CANCEL, - NULL - }; - - gnome_dialog_constructv (GNOME_DIALOG (dialog), - _("Rollback and Location Management"), - buttons); - - dialog->p = g_new0 (CreateLocationDialogPrivate, 1); - dialog->p->create_dialog_data = - glade_xml_new (GLADE_DIR "/rollback-location-management.glade", - "create_dialog_data"); - - gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)->vbox), - WID ("create_dialog_data"), 0, TRUE, TRUE); - - gtk_window_set_policy (GTK_WINDOW (dialog), TRUE, FALSE, TRUE); - - gnome_dialog_button_connect (GNOME_DIALOG (dialog), - 0, GTK_SIGNAL_FUNC (ok_cb), - dialog); - gnome_dialog_button_connect (GNOME_DIALOG (dialog), - 1, GTK_SIGNAL_FUNC (cancel_cb), - dialog); - - dialog->p->location_list = - LOCATION_LIST (location_list_new (FALSE, NULL, NULL)); - - gtk_widget_show (GTK_WIDGET (dialog->p->location_list)); - gtk_container_add (GTK_CONTAINER (WID ("location_list_location")), - GTK_WIDGET (dialog->p->location_list)); -} - -static void -create_location_dialog_class_init (CreateLocationDialogClass *class) -{ - GtkObjectClass *object_class; - - gtk_object_add_arg_type ("CreateLocationDialog::type", - GTK_TYPE_INT, - GTK_ARG_CONSTRUCT_ONLY | GTK_ARG_READWRITE, - ARG_TYPE); - - object_class = GTK_OBJECT_CLASS (class); - object_class->finalize = create_location_dialog_finalize; - object_class->set_arg = create_location_dialog_set_arg; - object_class->get_arg = create_location_dialog_get_arg; - - create_location_dialog_signals[CREATE_LOCATION_SIGNAL] = - gtk_signal_new ("create-location", GTK_RUN_FIRST, - object_class->type, - GTK_SIGNAL_OFFSET (CreateLocationDialogClass, - create_location), - gtk_marshal_NONE__POINTER_POINTER, - GTK_TYPE_NONE, 2, GTK_TYPE_POINTER, - GTK_TYPE_POINTER); - - gtk_object_class_add_signals (object_class, - create_location_dialog_signals, - LAST_SIGNAL); - - parent_class = GNOME_DIALOG_CLASS - (gtk_type_class (gnome_dialog_get_type ())); -} - -static void -create_location_dialog_set_arg (GtkObject *object, GtkArg *arg, guint arg_id) -{ - CreateLocationDialog *dialog; - - g_return_if_fail (object != NULL); - g_return_if_fail (IS_CREATE_LOCATION_DIALOG (object)); - - dialog = CREATE_LOCATION_DIALOG (object); - - switch (arg_id) { - case ARG_TYPE: - dialog->p->type = GTK_VALUE_INT (*arg); - - switch (dialog->p->type) { - case CM_DIALOG_USER_ONLY: - dialog->p->user_archive = - ARCHIVE (archive_load (FALSE)); - dialog->p->global_archive = NULL; - break; - - case CM_DIALOG_GLOBAL_ONLY: - dialog->p->global_archive = - ARCHIVE (archive_load (TRUE)); - dialog->p->user_archive = NULL; - break; - - case CM_DIALOG_BOTH: - dialog->p->user_archive = - ARCHIVE (archive_load (FALSE)); - dialog->p->global_archive = - ARCHIVE (archive_load (TRUE)); - break; - } - - gtk_object_set (GTK_OBJECT (dialog->p->location_list), - "user-archive", dialog->p->user_archive, - "global-archive", dialog->p->global_archive, - NULL); - - break; - - default: - g_warning ("Bad argument set"); - break; - } -} - -static void -create_location_dialog_get_arg (GtkObject *object, GtkArg *arg, guint arg_id) -{ - CreateLocationDialog *dialog; - - g_return_if_fail (object != NULL); - g_return_if_fail (IS_CREATE_LOCATION_DIALOG (object)); - - dialog = CREATE_LOCATION_DIALOG (object); - - switch (arg_id) { - case ARG_TYPE: - GTK_VALUE_INT (*arg) = dialog->p->type; - break; - - default: - g_warning ("Bad argument get"); - break; - } -} - -static void -create_location_dialog_finalize (GtkObject *object) -{ - CreateLocationDialog *dialog; - - g_return_if_fail (object != NULL); - g_return_if_fail (IS_CREATE_LOCATION_DIALOG (object)); - - dialog = CREATE_LOCATION_DIALOG (object); - - g_free (dialog->p); - - GTK_OBJECT_CLASS (parent_class)->finalize (object); -} - -GtkObject * -create_location_dialog_new (CMDialogType type) -{ - return gtk_object_new (create_location_dialog_get_type (), - "type", type, - NULL); -} - -static void -ok_cb (GtkWidget *widget, CreateLocationDialog *dialog) -{ - g_return_if_fail (dialog != NULL); - g_return_if_fail (IS_CREATE_LOCATION_DIALOG (dialog)); - - gtk_signal_emit (GTK_OBJECT (dialog), - create_location_dialog_signals - [CREATE_LOCATION_SIGNAL], - gtk_entry_get_text - (GTK_ENTRY (WID ("location_name_entry"))), - location_list_get_selected_location - (dialog->p->location_list)); - - gnome_dialog_close (GNOME_DIALOG (dialog)); -} - -static void -cancel_cb (GtkWidget *widget, CreateLocationDialog *dialog) -{ - g_return_if_fail (dialog != NULL); - g_return_if_fail (IS_CREATE_LOCATION_DIALOG (dialog)); - - gnome_dialog_close (GNOME_DIALOG (dialog)); -} - diff --git a/archiver/create-location-dialog.h b/archiver/create-location-dialog.h deleted file mode 100644 index c01fd43c4..000000000 --- a/archiver/create-location-dialog.h +++ /dev/null @@ -1,62 +0,0 @@ -/* -*- mode: c; style: linux -*- */ - -/* create-location-dialog.h - * Copyright (C) 2000-2001 Ximian, Inc. - * - * Written by Bradford Hovinen <hovinen@ximian.com> - * - * 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, 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. - */ - -#ifndef __CREATE_LOCATION_DIALOG_H -#define __CREATE_LOCATION_DIALOG_H - -#include <gnome.h> - -#include "config-manager-dialog.h" -#include "location.h" - -BEGIN_GNOME_DECLS - -#define CREATE_LOCATION_DIALOG(obj) GTK_CHECK_CAST (obj, create_location_dialog_get_type (), CreateLocationDialog) -#define CREATE_LOCATION_DIALOG_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, create_location_dialog_get_type (), CreateLocationDialogClass) -#define IS_CREATE_LOCATION_DIALOG(obj) GTK_CHECK_TYPE (obj, create_location_dialog_get_type ()) - -typedef struct _CreateLocationDialog CreateLocationDialog; -typedef struct _CreateLocationDialogClass CreateLocationDialogClass; -typedef struct _CreateLocationDialogPrivate CreateLocationDialogPrivate; - -struct _CreateLocationDialog -{ - GnomeDialog parent; - - CreateLocationDialogPrivate *p; -}; - -struct _CreateLocationDialogClass -{ - GnomeDialogClass gnome_dialog_class; - - void (*create_location) (CreateLocationDialog *, gchar *, Location *); -}; - -guint create_location_dialog_get_type (void); - -GtkObject *create_location_dialog_new (CMDialogType type); - -END_GNOME_DECLS - -#endif /* __CREATE_LOCATION_DIALOG_H */ diff --git a/archiver/location-list.c b/archiver/location-list.c deleted file mode 100644 index ccfeaa788..000000000 --- a/archiver/location-list.c +++ /dev/null @@ -1,364 +0,0 @@ -/* -*- mode: c; style: linux -*- */ - -/* location-list.c - * Copyright (C) 2000-2001 Ximian, Inc. - * - * Written by Bradford Hovinen <hovinen@ximian.com> - * - * 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, 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. - */ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#include "location-list.h" - -typedef struct _pair_t pair_t; - -struct _pair_t -{ - gpointer a, b; -}; - -enum { - ARG_0, - ARG_USER_ARCHIVE, - ARG_GLOBAL_ARCHIVE, - ARG_SEPARATE_LOCATIONS -}; - -struct _LocationListPrivate -{ - gchar *selected_location_id; - Location *selected_location; - - gboolean separate_locations; - Archive *user_archive; - Archive *global_archive; -}; - -static GtkCTreeClass *parent_class; - -static void location_list_init (LocationList *location_list); -static void location_list_class_init (LocationListClass *class); - -static void location_list_set_arg (GtkObject *object, - GtkArg *arg, - guint arg_id); -static void location_list_get_arg (GtkObject *object, - GtkArg *arg, - guint arg_id); - -static void select_row_cb (LocationList *list, - GList *node, gint column); - -static void location_list_finalize (GtkObject *object); - -static gint populate_locations_cb (Archive *archive, - Location *location, - pair_t *data); -static void populate_locations_list (LocationList *list, - gboolean do_global); - -guint -location_list_get_type (void) -{ - static guint location_list_type = 0; - - if (!location_list_type) { - GtkTypeInfo location_list_info = { - "LocationList", - sizeof (LocationList), - sizeof (LocationListClass), - (GtkClassInitFunc) location_list_class_init, - (GtkObjectInitFunc) location_list_init, - (GtkArgSetFunc) NULL, - (GtkArgGetFunc) NULL - }; - - location_list_type = - gtk_type_unique (gtk_ctree_get_type (), - &location_list_info); - } - - return location_list_type; -} - -static void -location_list_init (LocationList *location_list) -{ - static char *titles = { "Location" }; - - gtk_ctree_construct (GTK_CTREE (location_list), - 1, 0, &titles); - - gtk_clist_column_titles_hide (GTK_CLIST (location_list)); - - location_list->p = g_new0 (LocationListPrivate, 1); - - gtk_signal_connect (GTK_OBJECT (location_list), - "tree-select-row", GTK_SIGNAL_FUNC (select_row_cb), - NULL); -} - -static void -location_list_class_init (LocationListClass *class) -{ - GtkObjectClass *object_class; - - gtk_object_add_arg_type ("LocationList::user-archive", - GTK_TYPE_POINTER, - GTK_ARG_READWRITE, - ARG_USER_ARCHIVE); - - gtk_object_add_arg_type ("LocationList::global-archive", - GTK_TYPE_POINTER, - GTK_ARG_READWRITE, - ARG_GLOBAL_ARCHIVE); - - gtk_object_add_arg_type ("LocationList::separate-locations", - GTK_TYPE_POINTER, - GTK_ARG_READWRITE, - ARG_SEPARATE_LOCATIONS); - - object_class = GTK_OBJECT_CLASS (class); - object_class->finalize = location_list_finalize; - object_class->set_arg = location_list_set_arg; - object_class->get_arg = location_list_get_arg; - - parent_class = GTK_CTREE_CLASS - (gtk_type_class (gtk_ctree_get_type ())); -} - -static void -location_list_set_arg (GtkObject *object, GtkArg *arg, guint arg_id) -{ - LocationList *location_list; - - g_return_if_fail (object != NULL); - g_return_if_fail (IS_LOCATION_LIST (object)); - - location_list = LOCATION_LIST (object); - - switch (arg_id) { - case ARG_USER_ARCHIVE: - g_return_if_fail (GTK_VALUE_POINTER (*arg) == NULL || - IS_ARCHIVE (GTK_VALUE_POINTER (*arg))); - - if (GTK_VALUE_POINTER (*arg) == NULL) return; - - location_list->p->user_archive = - ARCHIVE (GTK_VALUE_POINTER (*arg)); - - gtk_object_ref (GTK_OBJECT (location_list->p->user_archive)); - populate_locations_list (location_list, FALSE); - - break; - - case ARG_GLOBAL_ARCHIVE: - g_return_if_fail (GTK_VALUE_POINTER (*arg) == NULL || - IS_ARCHIVE (GTK_VALUE_POINTER (*arg))); - - if (GTK_VALUE_POINTER (*arg) == NULL) return; - - location_list->p->global_archive = - ARCHIVE (GTK_VALUE_POINTER (*arg)); - - gtk_object_ref (GTK_OBJECT (location_list->p->global_archive)); - populate_locations_list (location_list, TRUE); - - break; - - case ARG_SEPARATE_LOCATIONS: - location_list->p->separate_locations = - GTK_VALUE_INT (*arg); - break; - - default: - g_warning ("Bad argument set"); - break; - } -} - -static void -location_list_get_arg (GtkObject *object, GtkArg *arg, guint arg_id) -{ - LocationList *location_list; - - g_return_if_fail (object != NULL); - g_return_if_fail (IS_LOCATION_LIST (object)); - - location_list = LOCATION_LIST (object); - - switch (arg_id) { - case ARG_USER_ARCHIVE: - GTK_VALUE_POINTER (*arg) = location_list->p->user_archive; - break; - - case ARG_GLOBAL_ARCHIVE: - GTK_VALUE_POINTER (*arg) = location_list->p->global_archive; - break; - - case ARG_SEPARATE_LOCATIONS: - GTK_VALUE_INT (*arg) = location_list->p->separate_locations; - break; - - default: - g_warning ("Bad argument get"); - break; - } -} - -static void -location_list_finalize (GtkObject *object) -{ - LocationList *location_list; - - g_return_if_fail (object != NULL); - g_return_if_fail (IS_LOCATION_LIST (object)); - - location_list = LOCATION_LIST (object); - - if (location_list->p->user_archive != NULL) - gtk_object_unref - (GTK_OBJECT (location_list->p->user_archive)); - - if (location_list->p->global_archive != NULL) - gtk_object_unref - (GTK_OBJECT (location_list->p->global_archive)); - - g_free (location_list->p); - - GTK_OBJECT_CLASS (parent_class)->finalize (object); -} - -GtkWidget * -location_list_new (gboolean sep_locations, Archive *user_archive, - Archive *global_archive) -{ - return gtk_widget_new (location_list_get_type (), - "separate-locations", sep_locations, - "user-archive", user_archive, - "global-archive", global_archive, - NULL); -} - -gchar * -location_list_get_selected_location_id (LocationList *list) -{ - g_return_val_if_fail (list != NULL, NULL); - g_return_val_if_fail (IS_LOCATION_LIST (list), NULL); - - return list->p->selected_location_id; -} - -Location * -location_list_get_selected_location (LocationList *list) -{ - g_return_val_if_fail (list != NULL, NULL); - g_return_val_if_fail (IS_LOCATION_LIST (list), NULL); - - return list->p->selected_location; -} - -void -location_list_reread (LocationList *list) -{ - g_return_if_fail (list != NULL); - g_return_if_fail (IS_LOCATION_LIST (list)); - - gtk_clist_freeze (GTK_CLIST (list)); - gtk_clist_clear (GTK_CLIST (list)); - - if (list->p->global_archive) - populate_locations_list (list, TRUE); - - if (list->p->user_archive) - populate_locations_list (list, FALSE); - - gtk_clist_thaw (GTK_CLIST (list)); -} - -static void -select_row_cb (LocationList *list, GList *node, gint column) -{ - GtkCTreeRow *row; - - g_return_if_fail (list != NULL); - g_return_if_fail (IS_LOCATION_LIST (list)); - - row = GTK_CTREE_ROW (node); - list->p->selected_location = row->row.data; - list->p->selected_location_id = - GTK_CELL_PIXTEXT (row->row.cell[0])->text; -} - -static gint -populate_locations_cb (Archive *archive, Location *location, pair_t *data) -{ - pair_t new_pair; - char *label; - - label = g_strdup (location_get_label (location)); - - new_pair.b = gtk_ctree_insert_node (GTK_CTREE (data->a), - (GtkCTreeNode *) data->b, NULL, - &label, GNOME_PAD_SMALL, NULL, - NULL, NULL, NULL, FALSE, TRUE); - gtk_ctree_node_set_row_data (GTK_CTREE (data->a), - (GtkCTreeNode *) new_pair.b, - location); - - new_pair.a = data->a; - - archive_foreach_child_location (archive, - (LocationCB) populate_locations_cb, - location, &new_pair); - - return 0; -} - -static void -populate_locations_list (LocationList *list, gboolean do_global) -{ - pair_t pair; - Archive *archive; - char *label; - - if (do_global) { - archive = list->p->global_archive; - label = _("Global locations"); - } else { - archive = list->p->user_archive; - label = _("User locations"); - } - - pair.a = list; - - if (list->p->separate_locations) - pair.b = gtk_ctree_insert_node (GTK_CTREE (list), - NULL, NULL, &label, - GNOME_PAD_SMALL, NULL, - NULL, NULL, NULL, FALSE, - TRUE); - else - pair.b = NULL; - - archive_foreach_child_location (archive, - (LocationCB) populate_locations_cb, - NULL, &pair); -} diff --git a/archiver/location-list.h b/archiver/location-list.h deleted file mode 100644 index 328ede417..000000000 --- a/archiver/location-list.h +++ /dev/null @@ -1,68 +0,0 @@ -/* -*- mode: c; style: linux -*- */ - -/* location-list.h - * Copyright (C) 2000-2001 Ximian, Inc. - * - * Written by Bradford Hovinen <hovinen@ximian.com> - * - * 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, 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. - */ - -#ifndef __LOCATION_LIST_H -#define __LOCATION_LIST_H - -#include <gnome.h> - -#include "archive.h" -#include "location.h" -#include "config-manager-dialog.h" - -BEGIN_GNOME_DECLS - -#define LOCATION_LIST(obj) GTK_CHECK_CAST (obj, location_list_get_type (), LocationList) -#define LOCATION_LIST_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, location_list_get_type (), LocationListClass) -#define IS_LOCATION_LIST(obj) GTK_CHECK_TYPE (obj, location_list_get_type ()) - -typedef struct _LocationList LocationList; -typedef struct _LocationListClass LocationListClass; -typedef struct _LocationListPrivate LocationListPrivate; - -struct _LocationList -{ - GtkCTree parent; - - LocationListPrivate *p; -}; - -struct _LocationListClass -{ - GtkCTreeClass gtk_ctree_class; -}; - -guint location_list_get_type (void); - -GtkWidget *location_list_new (gboolean sep_locations, - Archive *user_archive, - Archive *global_archive); - -gchar *location_list_get_selected_location_id (LocationList *list); -Location *location_list_get_selected_location (LocationList *list); - -void location_list_reread (LocationList *list); - -END_GNOME_DECLS - -#endif /* __LOCATION_LIST_H */ diff --git a/archiver/rollback-widget.c b/archiver/rollback-widget.c deleted file mode 100644 index c823068c5..000000000 --- a/archiver/rollback-widget.c +++ /dev/null @@ -1,163 +0,0 @@ -/* -*- mode: c; style: linux -*- */ - -/* rollback-widget.c - * Copyright (C) 2000-2001 Ximian, Inc. - * - * Written by Bradford Hovinen <hovinen@ximian.com> - * - * 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, 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. - */ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#include "rollback-widget.h" - -enum { - ARG_0, - ARG_SAMPLE -}; - -struct _RollbackWidgetPrivate -{ - /* Private data members */ -}; - -static GtkWidgetClass *parent_class; - -static void rollback_widget_init (RollbackWidget *rollback_widget); -static void rollback_widget_class_init (RollbackWidgetClass *class); - -static void rollback_widget_set_arg (GtkObject *object, - GtkArg *arg, - guint arg_id); -static void rollback_widget_get_arg (GtkObject *object, - GtkArg *arg, - guint arg_id); - -static void rollback_widget_finalize (GtkObject *object); - -guint -rollback_widget_get_type (void) -{ - static guint rollback_widget_type = 0; - - if (!rollback_widget_type) { - GtkTypeInfo rollback_widget_info = { - "RollbackWidget", - sizeof (RollbackWidget), - sizeof (RollbackWidgetClass), - (GtkClassInitFunc) rollback_widget_class_init, - (GtkObjectInitFunc) rollback_widget_init, - (GtkArgSetFunc) NULL, - (GtkArgGetFunc) NULL - }; - - rollback_widget_type = - gtk_type_unique (gtk_widget_get_type (), - &rollback_widget_info); - } - - return rollback_widget_type; -} - -static void -rollback_widget_init (RollbackWidget *rollback_widget) -{ - rollback_widget->p = g_new0 (RollbackWidgetPrivate, 1); -} - -static void -rollback_widget_class_init (RollbackWidgetClass *class) -{ - GtkObjectClass *object_class; - - gtk_object_add_arg_type ("RollbackWidget::sample", - GTK_TYPE_POINTER, - GTK_ARG_READWRITE, - ARG_SAMPLE); - - object_class = GTK_OBJECT_CLASS (class); - object_class->finalize = rollback_widget_finalize; - object_class->set_arg = rollback_widget_set_arg; - object_class->get_arg = rollback_widget_get_arg; - - parent_class = GTK_WIDGET_CLASS - (gtk_type_class (gtk_widget_get_type ())); -} - -static void -rollback_widget_set_arg (GtkObject *object, GtkArg *arg, guint arg_id) -{ - RollbackWidget *rollback_widget; - - g_return_if_fail (object != NULL); - g_return_if_fail (IS_ROLLBACK_WIDGET (object)); - - rollback_widget = ROLLBACK_WIDGET (object); - - switch (arg_id) { - case ARG_SAMPLE: - break; - - default: - g_warning ("Bad argument set"); - break; - } -} - -static void -rollback_widget_get_arg (GtkObject *object, GtkArg *arg, guint arg_id) -{ - RollbackWidget *rollback_widget; - - g_return_if_fail (object != NULL); - g_return_if_fail (IS_ROLLBACK_WIDGET (object)); - - rollback_widget = ROLLBACK_WIDGET (object); - - switch (arg_id) { - case ARG_SAMPLE: - break; - - default: - g_warning ("Bad argument get"); - break; - } -} - -static void -rollback_widget_finalize (GtkObject *object) -{ - RollbackWidget *rollback_widget; - - g_return_if_fail (object != NULL); - g_return_if_fail (IS_ROLLBACK_WIDGET (object)); - - rollback_widget = ROLLBACK_WIDGET (object); - - g_free (rollback_widget->p); - - GTK_OBJECT_CLASS (parent_class)->finalize (object); -} - -GtkObject * -rollback_widget_new (void) -{ - return gtk_object_new (rollback_widget_get_type (), - NULL); -} diff --git a/archiver/rollback-widget.h b/archiver/rollback-widget.h deleted file mode 100644 index fcb0b79d1..000000000 --- a/archiver/rollback-widget.h +++ /dev/null @@ -1,57 +0,0 @@ -/* -*- mode: c; style: linux -*- */ - -/* rollback-widget.h - * Copyright (C) 2000-2001 Ximian, Inc. - * - * Written by Bradford Hovinen <hovinen@ximian.com> - * - * 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, 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. - */ - -#ifndef __ROLLBACK_WIDGET_H -#define __ROLLBACK_WIDGET_H - -#include <gnome.h> - -BEGIN_GNOME_DECLS - -#define ROLLBACK_WIDGET(obj) GTK_CHECK_CAST (obj, rollback_widget_get_type (), RollbackWidget) -#define ROLLBACK_WIDGET_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, rollback_widget_get_type (), RollbackWidgetClass) -#define IS_ROLLBACK_WIDGET(obj) GTK_CHECK_TYPE (obj, rollback_widget_get_type ()) - -typedef struct _RollbackWidget RollbackWidget; -typedef struct _RollbackWidgetClass RollbackWidgetClass; -typedef struct _RollbackWidgetPrivate RollbackWidgetPrivate; - -struct _RollbackWidget -{ - GtkWidget parent; - - RollbackWidgetPrivate *p; -}; - -struct _RollbackWidgetClass -{ - GtkWidgetClass gtk_widget_class; -}; - -guint rollback_widget_get_type (void); - -GtkObject *rollback_widget_new (void); - -END_GNOME_DECLS - -#endif /* __ROLLBACK_WIDGET_H */ diff --git a/capplets/Bonobo_Control_Capplet_sound_properties.oaf b/capplets/Bonobo_Control_Capplet_sound_properties.oaf deleted file mode 100644 index e0bebaeab..000000000 --- a/capplets/Bonobo_Control_Capplet_sound_properties.oaf +++ /dev/null @@ -1,20 +0,0 @@ -<oaf_info> - -<oaf_server iid="OAFIID:Bonobo_Control_Capplet_sound_properties_Factory" type="exe" location="sound-properties-capplet"> - <oaf_attribute name="repo_ids" type="stringv"> - <item value="IDL:GNOME/GenericFactory:1.0"/> - </oaf_attribute> - - <oaf_attribute name="name" type="string" value="Sound properties capplet factory"/> -</oaf_server> - -<oaf_server iid="OAFIID:Bonobo_Control_Capplet_sound_properties" type="factory" - location="OAFIID:Bonobo_Control_Capplet_sound_properties_Factory"> - <oaf_attribute name="repo_ids" type="stringv"> - <item value="IDL:Bonobo/Control:1.0"/> - <item value="IDL:Bonobo/Unknown:1.0"/> - </oaf_attribute> - <oaf_attribute name="name" type="string" value="Sound properties capplet"/> -</oaf_server> - -</oaf_info> diff --git a/capplets/Makefile.am b/capplets/Makefile.am index 524d699f8..d7412e787 100644 --- a/capplets/Makefile.am +++ b/capplets/Makefile.am @@ -1,42 +1,6 @@ -always_built_SUBDIRS = desktop-links \ - new-background-properties new-screensaver-properties \ - theme-switcher new-sound-properties new-bell-properties \ - new-ui-properties url-properties gnome-edit-properties \ - session-properties wm-properties new-keyboard-properties \ - mime-type new-mouse-properties +always_built_SUBDIRS = \ + background keyboard mouse rollback screensaver sound SUBDIRS = $(always_built_SUBDIRS) -INCLUDES = \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - -DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" \ - -DGLADE_DATADIR=\""$(datadir)/control-center-data"\" \ - @CAPPLET_CFLAGS@ \ - -I$(top_srcdir) \ - -I$(top_srcdir)/intl - -bin_PROGRAMS = sound-properties-capplet - -sound_properties_capplet_SOURCES = sound-properties-capplet.c - -sound_properties_capplet_LDADD = @CAPPLET_LIBS@ - -oafdir = $(datadir)/oaf -oaf_DATA = \ - Bonobo_Control_Capplet_sound_properties.oaf - -Gladedir = $(datadir)/control-center-data -Glade_DATA = \ - sound-properties.glade - -glade_msgs = \ - sound-properties.glade.h -Applicationsdir = $(datadir)/control-center/Desktop -Applications_DATA = \ - sound-properties.desktop - -pApplicationsdir = $(datadir)/gnome/apps/Settings/Desktop -pApplications_DATA = \ - sound-properties.desktop - -EXTRA_DIST = ChangeLog $(Applications_DATA) $(Glade_DATA) $(glade_msgs) $(oaf_DATA) +EXTRA_DIST = ChangeLog diff --git a/capplets/keyboard/ChangeLog b/capplets/keyboard/ChangeLog index b09187cfe..04dcf2231 100644 --- a/capplets/keyboard/ChangeLog +++ b/capplets/keyboard/ChangeLog @@ -1,3 +1,7 @@ +2001-07-05 Bradford Hovinen <hovinen@ximian.com> + + * prefs-widget.c (set_scale): Add appropriate casts + 2000-12-26 Jacob "Ulysses" Berkman <jacob@helixcode.com> * keyboard-properties.glade: re-did the UI a bit diff --git a/capplets/keyboard/prefs-widget.c b/capplets/keyboard/prefs-widget.c index e27ffc382..bfa097bcd 100644 --- a/capplets/keyboard/prefs-widget.c +++ b/capplets/keyboard/prefs-widget.c @@ -279,8 +279,8 @@ set_scale (GtkToggleButton *toggle, GtkWidget **arr) int i, retval = 0; for (i = 0; i < 4; i++) { - if (arr[i] == toggle) retval = i; - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (arr[i]), arr[i] == toggle); + if (arr[i] == GTK_WIDGET (toggle)) retval = i; + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (arr[i]), arr[i] == GTK_WIDGET (toggle)); } return retval; diff --git a/capplets/rollback/ChangeLog b/capplets/rollback/ChangeLog index 35e6a0775..e9c0b636e 100644 --- a/capplets/rollback/ChangeLog +++ b/capplets/rollback/ChangeLog @@ -1,3 +1,9 @@ +2001-07-05 Bradford Hovinen <hovinen@ximian.com> + + * Makefile.am (INCLUDES): + (rollback_capplet_LDADD): Update to include ximian_archiver stuff + correctly + 2001-01-29 Bradford Hovinen <hovinen@ximian.com> * rollback-widget.c (rollback_widget_realize): Check entire diff --git a/capplets/rollback/Makefile.am b/capplets/rollback/Makefile.am index 64046576c..b57044e44 100644 --- a/capplets/rollback/Makefile.am +++ b/capplets/rollback/Makefile.am @@ -22,7 +22,8 @@ INCLUDES = \ -DGLADE_DATADIR=\""$(Gladedir)"\" \ @ROLLBACK_CAPPLET_CFLAGS@ \ -I$(top_srcdir)/ \ - -I$(top_srcdir)/intl + -I$(top_srcdir)/intl \ + -I$(top_srcdir)/archiver bin_PROGRAMS = rollback-capplet @@ -33,4 +34,5 @@ rollback_capplet_SOURCES = \ main.c rollback_capplet_LDADD = \ + $(top_builddir)/archiver/libximian_archiver.la \ @ROLLBACK_CAPPLET_LIBS@ diff --git a/capplets/rollback/rollback-control.c b/capplets/rollback/rollback-control.c index 3cf2d474b..249ed3a57 100644 --- a/capplets/rollback/rollback-control.c +++ b/capplets/rollback/rollback-control.c @@ -180,9 +180,9 @@ rollback_control_set_arg (GtkObject *object, GtkArg *arg, guint arg_id) rollback_control->p->location = archive_get_current_location (rollback_control->p->archive); - rollback_control->p->config_log = - location_get_config_log - (rollback_control->p->location); +/* rollback_control->p->config_log = */ +/* location_get_config_log */ +/* (rollback_control->p->location); */ break; default: diff --git a/capplets/rollback/rollback.desktop b/capplets/rollback/rollback.desktop new file mode 100644 index 000000000..b34e7a620 --- /dev/null +++ b/capplets/rollback/rollback.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Name=Rollback +Comment=Restore earlier configuration +Exec=rollback-capplet +Terminal=0 +Type=Application diff --git a/capplets/screensaver/screensavers/3d_clock.xml.h b/capplets/screensaver/screensavers/3d_clock.xml.h deleted file mode 100644 index 0b63cf53b..000000000 --- a/capplets/screensaver/screensavers/3d_clock.xml.h +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - -gchar *s = N_("Twist:"); -gchar *s = N_("Low"); -gchar *s = N_("High"); -gchar *s = N_("Twist speed:"); -gchar *s = N_("Slow"); -gchar *s = N_("Fast"); -gchar *s = N_("Wobble:"); -gchar *s = N_("Low"); -gchar *s = N_("High"); -gchar *s = N_("Size:"); -gchar *s = N_("Small"); -gchar *s = N_("Large"); diff --git a/capplets/screensaver/screensavers/ant.xml.h b/capplets/screensaver/screensavers/ant.xml.h deleted file mode 100644 index e83ec1afb..000000000 --- a/capplets/screensaver/screensavers/ant.xml.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - -gchar *s = N_("Sharp turns"); -gchar *s = N_("Truchet lines"); -gchar *s = N_("Speed"); -gchar *s = N_("Slow"); -gchar *s = N_("Fast"); -gchar *s = N_("Timeout"); -gchar *s = N_("Small"); -gchar *s = N_("Large"); -gchar *s = N_("Random"); -gchar *s = N_("Specific"); -gchar *s = N_("number of Ants"); -gchar *s = N_("Random size upto"); -gchar *s = N_("Specific size of"); -gchar *s = N_("Number of colours"); -gchar *s = N_("Two"); -gchar *s = N_("Many"); -gchar *s = N_("Randomize"); -gchar *s = N_("Three Sided cells"); -gchar *s = N_("Four Sided cells"); -gchar *s = N_("Six Sided cells"); -gchar *s = N_("Nine Sided cells"); -gchar *s = N_("Twelve Sided cells"); -gchar *s = N_("Monochrome"); -gchar *s = N_("Full Color"); diff --git a/capplets/screensaver/screensavers/atlantis.xml.h b/capplets/screensaver/screensavers/atlantis.xml.h deleted file mode 100644 index ceff531f1..000000000 --- a/capplets/screensaver/screensavers/atlantis.xml.h +++ /dev/null @@ -1,6 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - diff --git a/capplets/screensaver/screensavers/attraction.xml.h b/capplets/screensaver/screensavers/attraction.xml.h deleted file mode 100644 index c9756f14b..000000000 --- a/capplets/screensaver/screensavers/attraction.xml.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - -gchar *s = N_("Balls"); -gchar *s = N_("Lines"); -gchar *s = N_("Tails"); -gchar *s = N_("Polygons"); -gchar *s = N_("Splines"); -gchar *s = N_("Threshold of repulsion"); -gchar *s = N_("Small"); -gchar *s = N_("Large"); -gchar *s = N_("Length of Trail"); -gchar *s = N_("Short"); -gchar *s = N_("Long"); -gchar *s = N_("Speed"); -gchar *s = N_("Slow"); -gchar *s = N_("Fast"); -gchar *s = N_("Full Color"); -gchar *s = N_("Monochrome"); -gchar *s = N_("Number of Colors"); -gchar *s = N_("Color Contrast"); -gchar *s = N_("Low"); -gchar *s = N_("High"); diff --git a/capplets/screensaver/screensavers/blitspin.xml.h b/capplets/screensaver/screensavers/blitspin.xml.h deleted file mode 100644 index 69da549da..000000000 --- a/capplets/screensaver/screensavers/blitspin.xml.h +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - -gchar *s = N_("Speed of rotation."); -gchar *s = N_("Faster"); -gchar *s = N_("Slower"); -gchar *s = N_("Speed of the 90 degree rotation."); -gchar *s = N_("Faster"); -gchar *s = N_("Slower"); -gchar *s = N_("Display screensaver in monochrome."); diff --git a/capplets/screensaver/screensavers/bouboule.xml.h b/capplets/screensaver/screensavers/bouboule.xml.h deleted file mode 100644 index b4fbbd382..000000000 --- a/capplets/screensaver/screensavers/bouboule.xml.h +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - -gchar *s = N_("Number of Colors."); -gchar *s = N_("Colors:"); -gchar *s = N_("Speed of Motion."); -gchar *s = N_("Faster"); -gchar *s = N_("Slower"); -gchar *s = N_("Number of bubbles to use."); -gchar *s = N_("Count:"); -gchar *s = N_("Use red/blue 3d seperation."); -gchar *s = N_("Display screensaver in monochrome."); diff --git a/capplets/screensaver/screensavers/braid.xml.h b/capplets/screensaver/screensavers/braid.xml.h deleted file mode 100644 index dd068eaff..000000000 --- a/capplets/screensaver/screensavers/braid.xml.h +++ /dev/null @@ -1,9 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - -gchar *s = N_("Number of Colors"); -gchar *s = N_("Colors:"); -gchar *s = N_("Display screensaver in monochrome."); diff --git a/capplets/screensaver/screensavers/bsod.xml.h b/capplets/screensaver/screensavers/bsod.xml.h deleted file mode 100644 index c12e176ce..000000000 --- a/capplets/screensaver/screensavers/bsod.xml.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - -gchar *s = N_("Speed"); -gchar *s = N_("Slow"); -gchar *s = N_("Fast"); -gchar *s = N_("Full Color"); -gchar *s = N_("Monochrome"); diff --git a/capplets/screensaver/screensavers/bubble3d.xml.h b/capplets/screensaver/screensavers/bubble3d.xml.h deleted file mode 100644 index ceff531f1..000000000 --- a/capplets/screensaver/screensavers/bubble3d.xml.h +++ /dev/null @@ -1,6 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - diff --git a/capplets/screensaver/screensavers/bubbles.xml.h b/capplets/screensaver/screensavers/bubbles.xml.h deleted file mode 100644 index 85a9699ab..000000000 --- a/capplets/screensaver/screensavers/bubbles.xml.h +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - -gchar *s = N_("Speed of Motion."); -gchar *s = N_("Faster"); -gchar *s = N_("Slower"); -gchar *s = N_("Draw circles instead of pixmap bubbles."); -gchar *s = N_("Don't hide bubbles when they pop."); -gchar *s = N_("Bubbles exist in three dimensions."); -gchar *s = N_("Display screensaver in monochrome."); diff --git a/capplets/screensaver/screensavers/cage.xml.h b/capplets/screensaver/screensavers/cage.xml.h deleted file mode 100644 index ceff531f1..000000000 --- a/capplets/screensaver/screensavers/cage.xml.h +++ /dev/null @@ -1,6 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - diff --git a/capplets/screensaver/screensavers/compass.xml.h b/capplets/screensaver/screensavers/compass.xml.h deleted file mode 100644 index d3451ee88..000000000 --- a/capplets/screensaver/screensavers/compass.xml.h +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - -gchar *s = N_("Use double buffering"); -gchar *s = N_("Don't use double bufferinge"); -gchar *s = N_("Speed"); -gchar *s = N_("Slow"); -gchar *s = N_("Fast"); -gchar *s = N_("Full Color"); -gchar *s = N_("Monochrome"); diff --git a/capplets/screensaver/screensavers/coral.xml.h b/capplets/screensaver/screensavers/coral.xml.h deleted file mode 100644 index 846a39029..000000000 --- a/capplets/screensaver/screensavers/coral.xml.h +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - -gchar *s = N_("Density"); -gchar *s = N_("Denser"); -gchar *s = N_("Thinner"); -gchar *s = N_("Number of seeds"); -gchar *s = N_("Seeds"); -gchar *s = N_("Speed of Motion."); -gchar *s = N_("Faster"); -gchar *s = N_("Slower"); diff --git a/capplets/screensaver/screensavers/critical.xml.h b/capplets/screensaver/screensavers/critical.xml.h deleted file mode 100644 index ceff531f1..000000000 --- a/capplets/screensaver/screensavers/critical.xml.h +++ /dev/null @@ -1,6 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - diff --git a/capplets/screensaver/screensavers/crystal.xml.h b/capplets/screensaver/screensavers/crystal.xml.h deleted file mode 100644 index f12e5e676..000000000 --- a/capplets/screensaver/screensavers/crystal.xml.h +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - -gchar *s = N_("Number of Colors."); -gchar *s = N_("Colors:"); -gchar *s = N_("Speed of Motion."); -gchar *s = N_("Faster"); -gchar *s = N_("Slower"); -gchar *s = N_("Number of polygons to use."); -gchar *s = N_("Count:"); -gchar *s = N_("Center image."); -gchar *s = N_("Display screensaver in monochrome."); -gchar *s = N_("Have at maximum size"); -gchar *s = N_("Cell"); diff --git a/capplets/screensaver/screensavers/cynosure.xml.h b/capplets/screensaver/screensavers/cynosure.xml.h deleted file mode 100644 index e81d88f93..000000000 --- a/capplets/screensaver/screensavers/cynosure.xml.h +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - -gchar *s = N_("Number of Colors."); -gchar *s = N_("Colors:"); -gchar *s = N_("Number of iterations."); -gchar *s = N_("Less"); -gchar *s = N_("More"); -gchar *s = N_("Speed of Motion."); -gchar *s = N_("Faster"); -gchar *s = N_("Slower"); -gchar *s = N_("Display screensaver in monochrome."); diff --git a/capplets/screensaver/screensavers/decayscreen.xml.h b/capplets/screensaver/screensavers/decayscreen.xml.h deleted file mode 100644 index edfe9bfc2..000000000 --- a/capplets/screensaver/screensavers/decayscreen.xml.h +++ /dev/null @@ -1,10 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - -gchar *s = N_("Speed of Motion."); -gchar *s = N_("Faster"); -gchar *s = N_("Slower"); -gchar *s = N_("Display screensaver in monochrome."); diff --git a/capplets/screensaver/screensavers/deco.xml.h b/capplets/screensaver/screensavers/deco.xml.h deleted file mode 100644 index e46cbc381..000000000 --- a/capplets/screensaver/screensavers/deco.xml.h +++ /dev/null @@ -1,10 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - -gchar *s = N_("Time between redraws:"); -gchar *s = N_("seconds"); -gchar *s = N_("Use color when drawing."); -gchar *s = N_("Cycle through colors."); diff --git a/capplets/screensaver/screensavers/deluxe.xml.h b/capplets/screensaver/screensavers/deluxe.xml.h deleted file mode 100644 index ceff531f1..000000000 --- a/capplets/screensaver/screensavers/deluxe.xml.h +++ /dev/null @@ -1,6 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - diff --git a/capplets/screensaver/screensavers/demon.xml.h b/capplets/screensaver/screensavers/demon.xml.h deleted file mode 100644 index ceff531f1..000000000 --- a/capplets/screensaver/screensavers/demon.xml.h +++ /dev/null @@ -1,6 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - diff --git a/capplets/screensaver/screensavers/discrete.xml.h b/capplets/screensaver/screensavers/discrete.xml.h deleted file mode 100644 index a4aeee2b5..000000000 --- a/capplets/screensaver/screensavers/discrete.xml.h +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - -gchar *s = N_("Number of Colors."); -gchar *s = N_("Colors:"); -gchar *s = N_("Speed of Motion."); -gchar *s = N_("Faster"); -gchar *s = N_("Slower"); -gchar *s = N_("Number to use."); -gchar *s = N_("Count:"); -gchar *s = N_("Display screensaver in monochrome."); diff --git a/capplets/screensaver/screensavers/distort.xml.h b/capplets/screensaver/screensavers/distort.xml.h deleted file mode 100644 index ceff531f1..000000000 --- a/capplets/screensaver/screensavers/distort.xml.h +++ /dev/null @@ -1,6 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - diff --git a/capplets/screensaver/screensavers/drift.xml.h b/capplets/screensaver/screensavers/drift.xml.h deleted file mode 100644 index 7e0106054..000000000 --- a/capplets/screensaver/screensavers/drift.xml.h +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - -gchar *s = N_("Number of Colors."); -gchar *s = N_("Colors:"); -gchar *s = N_("Speed of Motion."); -gchar *s = N_("Faster"); -gchar *s = N_("Slower"); -gchar *s = N_("Number of pixels to use."); -gchar *s = N_("Count:"); -gchar *s = N_("Fractals should grow."); -gchar *s = N_("Display screensaver in monochrome."); -gchar *s = N_("Use lissajous figures to get points."); diff --git a/capplets/screensaver/screensavers/epicycle.xml.h b/capplets/screensaver/screensavers/epicycle.xml.h deleted file mode 100644 index ae67d98b6..000000000 --- a/capplets/screensaver/screensavers/epicycle.xml.h +++ /dev/null @@ -1,12 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - -gchar *s = N_("Speed of Motion."); -gchar *s = N_("Faster"); -gchar *s = N_("Slower"); -gchar *s = N_("Time finished product is shown."); -gchar *s = N_("Seconds"); -gchar *s = N_("Display screensaver in monochrome."); diff --git a/capplets/screensaver/screensavers/fadeplot.xml.h b/capplets/screensaver/screensavers/fadeplot.xml.h deleted file mode 100644 index 1e9be0b89..000000000 --- a/capplets/screensaver/screensavers/fadeplot.xml.h +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - -gchar *s = N_("Number of Colors"); -gchar *s = N_("Colors:"); -gchar *s = N_("Number"); -gchar *s = N_("Count:"); -gchar *s = N_("Speed of Motion"); -gchar *s = N_("Faster"); -gchar *s = N_("Slower"); -gchar *s = N_("Number of cycles"); -gchar *s = N_("More"); -gchar *s = N_("Slower"); -gchar *s = N_("Display screensaver in monochrome."); diff --git a/capplets/screensaver/screensavers/flag.xml.h b/capplets/screensaver/screensavers/flag.xml.h deleted file mode 100644 index fbb0b3d94..000000000 --- a/capplets/screensaver/screensavers/flag.xml.h +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - -gchar *s = N_("Text for flag"); -gchar *s = N_("Bitmap for flag"); -gchar *s = N_("Speed"); -gchar *s = N_("Slow"); -gchar *s = N_("Fast"); -gchar *s = N_("Timeout"); -gchar *s = N_("Small"); -gchar *s = N_("Large"); -gchar *s = N_("Random size up to"); -gchar *s = N_("Specific size of"); -gchar *s = N_("Number of colours"); -gchar *s = N_("Two"); -gchar *s = N_("Many"); -gchar *s = N_("Full Color"); -gchar *s = N_("Monochrome"); diff --git a/capplets/screensaver/screensavers/flame.xml.h b/capplets/screensaver/screensavers/flame.xml.h deleted file mode 100644 index 3824acb4b..000000000 --- a/capplets/screensaver/screensavers/flame.xml.h +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - -gchar *s = N_("Number of fractals to generate."); -gchar *s = N_("Iterations:"); -gchar *s = N_("Pixels per fractal."); -gchar *s = N_("Less"); -gchar *s = N_("More"); -gchar *s = N_("Speed of Motion."); -gchar *s = N_("Faster"); -gchar *s = N_("Slower"); -gchar *s = N_("Time finished product is shown."); -gchar *s = N_("Faster"); -gchar *s = N_("Slower"); -gchar *s = N_("Display screensaver in monochrome."); diff --git a/capplets/screensaver/screensavers/flow.xml.h b/capplets/screensaver/screensavers/flow.xml.h deleted file mode 100644 index ceff531f1..000000000 --- a/capplets/screensaver/screensavers/flow.xml.h +++ /dev/null @@ -1,6 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - diff --git a/capplets/screensaver/screensavers/forest.xml.h b/capplets/screensaver/screensavers/forest.xml.h deleted file mode 100644 index d517767f2..000000000 --- a/capplets/screensaver/screensavers/forest.xml.h +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - -gchar *s = N_("Number of Colors."); -gchar *s = N_("Colors:"); -gchar *s = N_("Delay between redraws."); -gchar *s = N_("Faster"); -gchar *s = N_("Slower"); -gchar *s = N_("Number of trees to use."); -gchar *s = N_("Count:"); -gchar *s = N_("Display screensaver in monochrome."); diff --git a/capplets/screensaver/screensavers/galaxy.xml.h b/capplets/screensaver/screensavers/galaxy.xml.h deleted file mode 100644 index ceff531f1..000000000 --- a/capplets/screensaver/screensavers/galaxy.xml.h +++ /dev/null @@ -1,6 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - diff --git a/capplets/screensaver/screensavers/gears.xml.h b/capplets/screensaver/screensavers/gears.xml.h deleted file mode 100644 index ceff531f1..000000000 --- a/capplets/screensaver/screensavers/gears.xml.h +++ /dev/null @@ -1,6 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - diff --git a/capplets/screensaver/screensavers/glplanet.xml.h b/capplets/screensaver/screensavers/glplanet.xml.h deleted file mode 100644 index ceff531f1..000000000 --- a/capplets/screensaver/screensavers/glplanet.xml.h +++ /dev/null @@ -1,6 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - diff --git a/capplets/screensaver/screensavers/goop.xml.h b/capplets/screensaver/screensavers/goop.xml.h deleted file mode 100644 index 0fb9466b2..000000000 --- a/capplets/screensaver/screensavers/goop.xml.h +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - -gchar *s = N_("Number of bubbles to use."); -gchar *s = N_("Count:"); -gchar *s = N_("Speed of Motion."); -gchar *s = N_("Faster"); -gchar *s = N_("Slower"); -gchar *s = N_("Display screensaver in monochrome."); -gchar *s = N_("Have transparent bubbles."); -gchar *s = N_("Use additive color model."); diff --git a/capplets/screensaver/screensavers/grav.xml.h b/capplets/screensaver/screensavers/grav.xml.h deleted file mode 100644 index 93c7ea23c..000000000 --- a/capplets/screensaver/screensavers/grav.xml.h +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - -gchar *s = N_("Number of Colors."); -gchar *s = N_("Colors:"); -gchar *s = N_("Number of planets to use."); -gchar *s = N_("Count:"); -gchar *s = N_("Display screensaver in monochrome."); -gchar *s = N_("Orbit should decay."); -gchar *s = N_("Objects should leave trails behind them."); diff --git a/capplets/screensaver/screensavers/greynetic.xml.h b/capplets/screensaver/screensavers/greynetic.xml.h deleted file mode 100644 index edfe9bfc2..000000000 --- a/capplets/screensaver/screensavers/greynetic.xml.h +++ /dev/null @@ -1,10 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - -gchar *s = N_("Speed of Motion."); -gchar *s = N_("Faster"); -gchar *s = N_("Slower"); -gchar *s = N_("Display screensaver in monochrome."); diff --git a/capplets/screensaver/screensavers/halo.xml.h b/capplets/screensaver/screensavers/halo.xml.h deleted file mode 100644 index 7abd5d899..000000000 --- a/capplets/screensaver/screensavers/halo.xml.h +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - -gchar *s = N_("Number of Colors."); -gchar *s = N_("Colors:"); -gchar *s = N_("Number of circles to use."); -gchar *s = N_("Count:"); -gchar *s = N_("Speed of Motion."); -gchar *s = N_("Faster"); -gchar *s = N_("Slower"); -gchar *s = N_("Display screensaver in monochrome."); -gchar *s = N_("Use a gradient of colors between circles."); -gchar *s = N_("Animate circles."); -gchar *s = N_("Cycle through colormap."); diff --git a/capplets/screensaver/screensavers/helix.xml.h b/capplets/screensaver/screensavers/helix.xml.h deleted file mode 100644 index 160257628..000000000 --- a/capplets/screensaver/screensavers/helix.xml.h +++ /dev/null @@ -1,10 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - -gchar *s = N_("Time between redraws."); -gchar *s = N_("Faster"); -gchar *s = N_("Slower"); -gchar *s = N_("Display screensaver in monochrome."); diff --git a/capplets/screensaver/screensavers/hopalong.xml.h b/capplets/screensaver/screensavers/hopalong.xml.h deleted file mode 100644 index c0408624f..000000000 --- a/capplets/screensaver/screensavers/hopalong.xml.h +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - -gchar *s = N_("Number of Colors."); -gchar *s = N_("Colors:"); -gchar *s = N_("Speed of Motion."); -gchar *s = N_("Faster"); -gchar *s = N_("Slower"); -gchar *s = N_("Number of pixels before a color change."); -gchar *s = N_("Less"); -gchar *s = N_("More"); -gchar *s = N_("Display screensaver in monochrome."); diff --git a/capplets/screensaver/screensavers/hypercube.xml.h b/capplets/screensaver/screensavers/hypercube.xml.h deleted file mode 100644 index 0750f4342..000000000 --- a/capplets/screensaver/screensavers/hypercube.xml.h +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - -gchar *s = N_("Distance from center of cube"); -gchar *s = N_("Closer"); -gchar *s = N_("Farther"); -gchar *s = N_("Speed of Motion."); -gchar *s = N_("Faster"); -gchar *s = N_("Slower"); -gchar *s = N_("Display screensaver in monochrome."); diff --git a/capplets/screensaver/screensavers/ifs.xml.h b/capplets/screensaver/screensavers/ifs.xml.h deleted file mode 100644 index c10e03004..000000000 --- a/capplets/screensaver/screensavers/ifs.xml.h +++ /dev/null @@ -1,9 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - -gchar *s = N_("Number of Colors."); -gchar *s = N_("Colors:"); -gchar *s = N_("Display screensaver in monochrome."); diff --git a/capplets/screensaver/screensavers/imsmap.xml.h b/capplets/screensaver/screensavers/imsmap.xml.h deleted file mode 100644 index ceff531f1..000000000 --- a/capplets/screensaver/screensavers/imsmap.xml.h +++ /dev/null @@ -1,6 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - diff --git a/capplets/screensaver/screensavers/interference.xml.h b/capplets/screensaver/screensavers/interference.xml.h deleted file mode 100644 index ceff531f1..000000000 --- a/capplets/screensaver/screensavers/interference.xml.h +++ /dev/null @@ -1,6 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - diff --git a/capplets/screensaver/screensavers/jigsaw.xml.h b/capplets/screensaver/screensavers/jigsaw.xml.h deleted file mode 100644 index e4e49f64c..000000000 --- a/capplets/screensaver/screensavers/jigsaw.xml.h +++ /dev/null @@ -1,9 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - -gchar *s = N_("Speed of Motion."); -gchar *s = N_("Faster"); -gchar *s = N_("Slower"); diff --git a/capplets/screensaver/screensavers/julia.xml.h b/capplets/screensaver/screensavers/julia.xml.h deleted file mode 100644 index a4aeee2b5..000000000 --- a/capplets/screensaver/screensavers/julia.xml.h +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - -gchar *s = N_("Number of Colors."); -gchar *s = N_("Colors:"); -gchar *s = N_("Speed of Motion."); -gchar *s = N_("Faster"); -gchar *s = N_("Slower"); -gchar *s = N_("Number to use."); -gchar *s = N_("Count:"); -gchar *s = N_("Display screensaver in monochrome."); diff --git a/capplets/screensaver/screensavers/kaleidescope.xml.h b/capplets/screensaver/screensavers/kaleidescope.xml.h deleted file mode 100644 index df207b724..000000000 --- a/capplets/screensaver/screensavers/kaleidescope.xml.h +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - -gchar *s = N_("Number of segments."); -gchar *s = N_("Segments"); -gchar *s = N_("Number of trails."); -gchar *s = N_("Less"); -gchar *s = N_("More"); -gchar *s = N_("Speed of Motion."); -gchar *s = N_("Faster"); -gchar *s = N_("Slower"); -gchar *s = N_("Display screensaver in monochrome."); diff --git a/capplets/screensaver/screensavers/kumppa.xml.h b/capplets/screensaver/screensavers/kumppa.xml.h deleted file mode 100644 index ceff531f1..000000000 --- a/capplets/screensaver/screensavers/kumppa.xml.h +++ /dev/null @@ -1,6 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - diff --git a/capplets/screensaver/screensavers/lament.xml.h b/capplets/screensaver/screensavers/lament.xml.h deleted file mode 100644 index ceff531f1..000000000 --- a/capplets/screensaver/screensavers/lament.xml.h +++ /dev/null @@ -1,6 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - diff --git a/capplets/screensaver/screensavers/laser.xml.h b/capplets/screensaver/screensavers/laser.xml.h deleted file mode 100644 index 5c4c39aff..000000000 --- a/capplets/screensaver/screensavers/laser.xml.h +++ /dev/null @@ -1,12 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - -gchar *s = N_("Duration of laser burst."); -gchar *s = N_("Shorter"); -gchar *s = N_("Longer"); -gchar *s = N_("Size of burst."); -gchar *s = N_("Segments:"); -gchar *s = N_("Display screensaver in monochrome."); diff --git a/capplets/screensaver/screensavers/lightning.xml.h b/capplets/screensaver/screensavers/lightning.xml.h deleted file mode 100644 index c10e03004..000000000 --- a/capplets/screensaver/screensavers/lightning.xml.h +++ /dev/null @@ -1,9 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - -gchar *s = N_("Number of Colors."); -gchar *s = N_("Colors:"); -gchar *s = N_("Display screensaver in monochrome."); diff --git a/capplets/screensaver/screensavers/lisa.xml.h b/capplets/screensaver/screensavers/lisa.xml.h deleted file mode 100644 index 7e318fac2..000000000 --- a/capplets/screensaver/screensavers/lisa.xml.h +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - -gchar *s = N_("Number of Colors."); -gchar *s = N_("Colors:"); -gchar *s = N_("Speed of Motion."); -gchar *s = N_("Faster"); -gchar *s = N_("Slower"); -gchar *s = N_("Number to use."); -gchar *s = N_("Count:"); -gchar *s = N_("Size of object."); -gchar *s = N_("Smaller"); -gchar *s = N_("Larger"); -gchar *s = N_("Display screensaver in monochrome."); diff --git a/capplets/screensaver/screensavers/lissie.xml.h b/capplets/screensaver/screensavers/lissie.xml.h deleted file mode 100644 index ceff531f1..000000000 --- a/capplets/screensaver/screensavers/lissie.xml.h +++ /dev/null @@ -1,6 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - diff --git a/capplets/screensaver/screensavers/lmorph.xml.h b/capplets/screensaver/screensavers/lmorph.xml.h deleted file mode 100644 index 724906f22..000000000 --- a/capplets/screensaver/screensavers/lmorph.xml.h +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - -gchar *s = N_("Number of points."); -gchar *s = N_("Points:"); -gchar *s = N_("Number of interpolation steps."); -gchar *s = N_("Less"); -gchar *s = N_("More"); -gchar *s = N_("Speed of Motion."); -gchar *s = N_("Faster"); -gchar *s = N_("Slower"); -gchar *s = N_("Open figures."); -gchar *s = N_("Display screensaver in monochrome."); diff --git a/capplets/screensaver/screensavers/loop.xml.h b/capplets/screensaver/screensavers/loop.xml.h deleted file mode 100644 index ceff531f1..000000000 --- a/capplets/screensaver/screensavers/loop.xml.h +++ /dev/null @@ -1,6 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - diff --git a/capplets/screensaver/screensavers/maze.xml.h b/capplets/screensaver/screensavers/maze.xml.h deleted file mode 100644 index 9e71b4f18..000000000 --- a/capplets/screensaver/screensavers/maze.xml.h +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - -gchar *s = N_("Delay between each step in the maze."); -gchar *s = N_("Less Delay"); -gchar *s = N_("More Delay"); -gchar *s = N_("Delay between drawing the maze and starting the solution."); -gchar *s = N_("Less Delay"); -gchar *s = N_("More Delay"); -gchar *s = N_("Delay between finishing the maze and starting a new one."); -gchar *s = N_("Less Delay"); -gchar *s = N_("More Delay"); -gchar *s = N_("Put a bridge over the logo?"); diff --git a/capplets/screensaver/screensavers/moebius.xml.h b/capplets/screensaver/screensavers/moebius.xml.h deleted file mode 100644 index ceff531f1..000000000 --- a/capplets/screensaver/screensavers/moebius.xml.h +++ /dev/null @@ -1,6 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - diff --git a/capplets/screensaver/screensavers/moire.xml.h b/capplets/screensaver/screensavers/moire.xml.h deleted file mode 100644 index 9771bbdd4..000000000 --- a/capplets/screensaver/screensavers/moire.xml.h +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - -gchar *s = N_("Speed of Motion."); -gchar *s = N_("Faster"); -gchar *s = N_("Slower"); -gchar *s = N_("Number of Colors."); -gchar *s = N_("Colors:"); -gchar *s = N_("Maximum radius increment"); -gchar *s = N_("Smaller"); -gchar *s = N_("Larger"); -gchar *s = N_("Display screensaver in monochrome."); diff --git a/capplets/screensaver/screensavers/moire2.xml.h b/capplets/screensaver/screensavers/moire2.xml.h deleted file mode 100644 index ceff531f1..000000000 --- a/capplets/screensaver/screensavers/moire2.xml.h +++ /dev/null @@ -1,6 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - diff --git a/capplets/screensaver/screensavers/morph3d.xml.h b/capplets/screensaver/screensavers/morph3d.xml.h deleted file mode 100644 index ceff531f1..000000000 --- a/capplets/screensaver/screensavers/morph3d.xml.h +++ /dev/null @@ -1,6 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - diff --git a/capplets/screensaver/screensavers/mountain.xml.h b/capplets/screensaver/screensavers/mountain.xml.h deleted file mode 100644 index ceff531f1..000000000 --- a/capplets/screensaver/screensavers/mountain.xml.h +++ /dev/null @@ -1,6 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - diff --git a/capplets/screensaver/screensavers/munch.xml.h b/capplets/screensaver/screensavers/munch.xml.h deleted file mode 100644 index 936465d52..000000000 --- a/capplets/screensaver/screensavers/munch.xml.h +++ /dev/null @@ -1,12 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - -gchar *s = N_("Speed of Motion."); -gchar *s = N_("Faster"); -gchar *s = N_("Slower"); -gchar *s = N_("Use XOR drawing function."); -gchar *s = N_("Draw square at weird starting points."); -gchar *s = N_("Display screensaver in monochrome."); diff --git a/capplets/screensaver/screensavers/noseguy.xml.h b/capplets/screensaver/screensavers/noseguy.xml.h deleted file mode 100644 index ceff531f1..000000000 --- a/capplets/screensaver/screensavers/noseguy.xml.h +++ /dev/null @@ -1,6 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - diff --git a/capplets/screensaver/screensavers/pedal.xml.h b/capplets/screensaver/screensavers/pedal.xml.h deleted file mode 100644 index 277163b29..000000000 --- a/capplets/screensaver/screensavers/pedal.xml.h +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - -gchar *s = N_("Time to show each picture."); -gchar *s = N_("Shorter"); -gchar *s = N_("Longer"); -gchar *s = N_("Maximum number of lines."); -gchar *s = N_("Less"); -gchar *s = N_("More"); -gchar *s = N_("Time to fade away."); -gchar *s = N_("Shorter"); -gchar *s = N_("Longer"); -gchar *s = N_("Display screensaver in monochrome."); diff --git a/capplets/screensaver/screensavers/penetrate.xml.h b/capplets/screensaver/screensavers/penetrate.xml.h deleted file mode 100644 index ceff531f1..000000000 --- a/capplets/screensaver/screensavers/penetrate.xml.h +++ /dev/null @@ -1,6 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - diff --git a/capplets/screensaver/screensavers/penrose.xml.h b/capplets/screensaver/screensavers/penrose.xml.h deleted file mode 100644 index ceff531f1..000000000 --- a/capplets/screensaver/screensavers/penrose.xml.h +++ /dev/null @@ -1,6 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - diff --git a/capplets/screensaver/screensavers/pipes.xml.h b/capplets/screensaver/screensavers/pipes.xml.h deleted file mode 100644 index ceff531f1..000000000 --- a/capplets/screensaver/screensavers/pipes.xml.h +++ /dev/null @@ -1,6 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - diff --git a/capplets/screensaver/screensavers/pyro.xml.h b/capplets/screensaver/screensavers/pyro.xml.h deleted file mode 100644 index 1c7b583ad..000000000 --- a/capplets/screensaver/screensavers/pyro.xml.h +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - -gchar *s = N_("Particles on screen"); -gchar *s = N_("Count:"); -gchar *s = N_("Frequency of missile launch"); -gchar *s = N_("Slower"); -gchar *s = N_("Faster"); -gchar *s = N_("Number of particles"); -gchar *s = N_("Less"); -gchar *s = N_("More"); diff --git a/capplets/screensaver/screensavers/qix.xml.h b/capplets/screensaver/screensavers/qix.xml.h deleted file mode 100644 index 6c4e379a3..000000000 --- a/capplets/screensaver/screensavers/qix.xml.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - -gchar *s = N_("Lines"); -gchar *s = N_("Polygons"); -gchar *s = N_("Number of points:"); -gchar *s = N_("Discrete Lines"); -gchar *s = N_("Solid Trails"); -gchar *s = N_("Transparent Trails"); -gchar *s = N_("XOR Trails"); -gchar *s = N_("Trails attract each other"); -gchar *s = N_("Speed"); -gchar *s = N_("Slow"); -gchar *s = N_("Fast"); -gchar *s = N_("Length"); -gchar *s = N_("Short"); -gchar *s = N_("Long"); -gchar *s = N_("Width"); -gchar *s = N_("Narrow"); -gchar *s = N_("Wide"); -gchar *s = N_("Spread between lines"); -gchar *s = N_("Short"); -gchar *s = N_("Long"); -gchar *s = N_("Number of trails:"); -gchar *s = N_("Full Color"); -gchar *s = N_("Monochrome"); -gchar *s = N_("Color contrast"); -gchar *s = N_("Low"); -gchar *s = N_("High"); diff --git a/capplets/screensaver/screensavers/rd-bomb.xml.h b/capplets/screensaver/screensavers/rd-bomb.xml.h deleted file mode 100644 index ceff531f1..000000000 --- a/capplets/screensaver/screensavers/rd-bomb.xml.h +++ /dev/null @@ -1,6 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - diff --git a/capplets/screensaver/screensavers/rocks.xml.h b/capplets/screensaver/screensavers/rocks.xml.h deleted file mode 100644 index ceff531f1..000000000 --- a/capplets/screensaver/screensavers/rocks.xml.h +++ /dev/null @@ -1,6 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - diff --git a/capplets/screensaver/screensavers/rorschach.xml.h b/capplets/screensaver/screensavers/rorschach.xml.h deleted file mode 100644 index a853fe9e4..000000000 --- a/capplets/screensaver/screensavers/rorschach.xml.h +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - -gchar *s = N_("Number of Iterations"); -gchar *s = N_("Small"); -gchar *s = N_("Large"); -gchar *s = N_("Offset"); -gchar *s = N_("Small"); -gchar *s = N_("Large"); -gchar *s = N_("With X-axis Symmetry"); -gchar *s = N_("With Y-axis Symmetry"); -gchar *s = N_("Delay before next redraw"); -gchar *s = N_("Short"); -gchar *s = N_("Long"); -gchar *s = N_("Speed to clear the screen"); diff --git a/capplets/screensaver/screensavers/rotor.xml.h b/capplets/screensaver/screensavers/rotor.xml.h deleted file mode 100644 index ceff531f1..000000000 --- a/capplets/screensaver/screensavers/rotor.xml.h +++ /dev/null @@ -1,6 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - diff --git a/capplets/screensaver/screensavers/rubiks_cube.xml.h b/capplets/screensaver/screensavers/rubiks_cube.xml.h deleted file mode 100644 index ceff531f1..000000000 --- a/capplets/screensaver/screensavers/rubiks_cube.xml.h +++ /dev/null @@ -1,6 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - diff --git a/capplets/screensaver/screensavers/sierpinski.xml.h b/capplets/screensaver/screensavers/sierpinski.xml.h deleted file mode 100644 index 9dc36a27d..000000000 --- a/capplets/screensaver/screensavers/sierpinski.xml.h +++ /dev/null @@ -1,12 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - -gchar *s = N_("Number of Colors"); -gchar *s = N_("Colors:"); -gchar *s = N_("Speed of Motion"); -gchar *s = N_("Faster"); -gchar *s = N_("Slower"); -gchar *s = N_("Display screensaver in monochrome."); diff --git a/capplets/screensaver/screensavers/slidescreen.xml.h b/capplets/screensaver/screensavers/slidescreen.xml.h deleted file mode 100644 index ceff531f1..000000000 --- a/capplets/screensaver/screensavers/slidescreen.xml.h +++ /dev/null @@ -1,6 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - diff --git a/capplets/screensaver/screensavers/slip.xml.h b/capplets/screensaver/screensavers/slip.xml.h deleted file mode 100644 index ceff531f1..000000000 --- a/capplets/screensaver/screensavers/slip.xml.h +++ /dev/null @@ -1,6 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - diff --git a/capplets/screensaver/screensavers/sonar.xml.h b/capplets/screensaver/screensavers/sonar.xml.h deleted file mode 100644 index ceff531f1..000000000 --- a/capplets/screensaver/screensavers/sonar.xml.h +++ /dev/null @@ -1,6 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - diff --git a/capplets/screensaver/screensavers/sphere.xml.h b/capplets/screensaver/screensavers/sphere.xml.h deleted file mode 100644 index ceff531f1..000000000 --- a/capplets/screensaver/screensavers/sphere.xml.h +++ /dev/null @@ -1,6 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - diff --git a/capplets/screensaver/screensavers/spiral.xml.h b/capplets/screensaver/screensavers/spiral.xml.h deleted file mode 100644 index 158174f3c..000000000 --- a/capplets/screensaver/screensavers/spiral.xml.h +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - -gchar *s = N_("Time between redraws:"); -gchar *s = N_("Seconds"); -gchar *s = N_("Speed of Motion."); -gchar *s = N_("Faster"); -gchar *s = N_("Slower"); -gchar *s = N_("Number of Colors"); -gchar *s = N_("Colors:"); -gchar *s = N_("Number to use."); -gchar *s = N_("Count:"); -gchar *s = N_("Display screensaver in monochrome."); diff --git a/capplets/screensaver/screensavers/spotlight.xml.h b/capplets/screensaver/screensavers/spotlight.xml.h deleted file mode 100644 index ceff531f1..000000000 --- a/capplets/screensaver/screensavers/spotlight.xml.h +++ /dev/null @@ -1,6 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - diff --git a/capplets/screensaver/screensavers/sproingies.xml.h b/capplets/screensaver/screensavers/sproingies.xml.h deleted file mode 100644 index ceff531f1..000000000 --- a/capplets/screensaver/screensavers/sproingies.xml.h +++ /dev/null @@ -1,6 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - diff --git a/capplets/screensaver/screensavers/squiral.xml.h b/capplets/screensaver/screensavers/squiral.xml.h deleted file mode 100644 index ceff531f1..000000000 --- a/capplets/screensaver/screensavers/squiral.xml.h +++ /dev/null @@ -1,6 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - diff --git a/capplets/screensaver/screensavers/stairs.xml.h b/capplets/screensaver/screensavers/stairs.xml.h deleted file mode 100644 index ceff531f1..000000000 --- a/capplets/screensaver/screensavers/stairs.xml.h +++ /dev/null @@ -1,6 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - diff --git a/capplets/screensaver/screensavers/starfish.xml.h b/capplets/screensaver/screensavers/starfish.xml.h deleted file mode 100644 index 4818fabb3..000000000 --- a/capplets/screensaver/screensavers/starfish.xml.h +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - -gchar *s = N_("Speed of animation."); -gchar *s = N_("Fast"); -gchar *s = N_("Slow"); -gchar *s = N_("Thickness of color bands (0 = Random)"); -gchar *s = N_("Slim"); -gchar *s = N_("Quickness of rotation at each step (0 = Random)"); -gchar *s = N_("Slow"); -gchar *s = N_("Duration of current shape."); -gchar *s = N_("Seconds"); -gchar *s = N_("Use raw shapes "); -gchar *s = N_("Change to display in monochrome."); diff --git a/capplets/screensaver/screensavers/strange.xml.h b/capplets/screensaver/screensavers/strange.xml.h deleted file mode 100644 index ceff531f1..000000000 --- a/capplets/screensaver/screensavers/strange.xml.h +++ /dev/null @@ -1,6 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - diff --git a/capplets/screensaver/screensavers/superquadrics.xml.h b/capplets/screensaver/screensavers/superquadrics.xml.h deleted file mode 100644 index ceff531f1..000000000 --- a/capplets/screensaver/screensavers/superquadrics.xml.h +++ /dev/null @@ -1,6 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - diff --git a/capplets/screensaver/screensavers/swirl.xml.h b/capplets/screensaver/screensavers/swirl.xml.h deleted file mode 100644 index ceff531f1..000000000 --- a/capplets/screensaver/screensavers/swirl.xml.h +++ /dev/null @@ -1,6 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - diff --git a/capplets/screensaver/screensavers/triangle.xml.h b/capplets/screensaver/screensavers/triangle.xml.h deleted file mode 100644 index dd068eaff..000000000 --- a/capplets/screensaver/screensavers/triangle.xml.h +++ /dev/null @@ -1,9 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - -gchar *s = N_("Number of Colors"); -gchar *s = N_("Colors:"); -gchar *s = N_("Display screensaver in monochrome."); diff --git a/capplets/screensaver/screensavers/truchet.xml.h b/capplets/screensaver/screensavers/truchet.xml.h deleted file mode 100644 index ceff531f1..000000000 --- a/capplets/screensaver/screensavers/truchet.xml.h +++ /dev/null @@ -1,6 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - diff --git a/capplets/screensaver/screensavers/vines.xml.h b/capplets/screensaver/screensavers/vines.xml.h deleted file mode 100644 index dd068eaff..000000000 --- a/capplets/screensaver/screensavers/vines.xml.h +++ /dev/null @@ -1,9 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - -gchar *s = N_("Number of Colors"); -gchar *s = N_("Colors:"); -gchar *s = N_("Display screensaver in monochrome."); diff --git a/capplets/screensaver/screensavers/worm.xml.h b/capplets/screensaver/screensavers/worm.xml.h deleted file mode 100644 index ceff531f1..000000000 --- a/capplets/screensaver/screensavers/worm.xml.h +++ /dev/null @@ -1,6 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - diff --git a/capplets/screensaver/screensavers/xflame.xml.h b/capplets/screensaver/screensavers/xflame.xml.h deleted file mode 100644 index ceff531f1..000000000 --- a/capplets/screensaver/screensavers/xflame.xml.h +++ /dev/null @@ -1,6 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - diff --git a/capplets/screensaver/screensavers/xjack.xml.h b/capplets/screensaver/screensavers/xjack.xml.h deleted file mode 100644 index ceff531f1..000000000 --- a/capplets/screensaver/screensavers/xjack.xml.h +++ /dev/null @@ -1,6 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - diff --git a/capplets/screensaver/screensavers/xlyap.xml.h b/capplets/screensaver/screensavers/xlyap.xml.h deleted file mode 100644 index ceff531f1..000000000 --- a/capplets/screensaver/screensavers/xlyap.xml.h +++ /dev/null @@ -1,6 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - diff --git a/capplets/screensaver/screensavers/xmatrix.xml.h b/capplets/screensaver/screensavers/xmatrix.xml.h deleted file mode 100644 index ceff531f1..000000000 --- a/capplets/screensaver/screensavers/xmatrix.xml.h +++ /dev/null @@ -1,6 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - diff --git a/capplets/screensaver/screensavers/xroger.xml.h b/capplets/screensaver/screensavers/xroger.xml.h deleted file mode 100644 index 6aab89b25..000000000 --- a/capplets/screensaver/screensavers/xroger.xml.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - * Translatable strings file generated by extract-labels - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - -gchar *s = N_("Display screensaver in monochrome."); diff --git a/capplets/sound-properties-capplet.c b/capplets/sound-properties-capplet.c deleted file mode 100644 index 78883dff4..000000000 --- a/capplets/sound-properties-capplet.c +++ /dev/null @@ -1,312 +0,0 @@ -/* -*- mode: c; style: linux -*- */ - -/* sound-properties-capplet.c - * Copyright (C) 2000 Ximian, Inc. - * - * Written by Bradford Hovinen <hovinen@ximian.com> - * - * 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, 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. - */ - -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - -#define DEBUG_MSG(str, args...) \ - g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "(%d:%s) " str, \ - getpid (), __FUNCTION__ , ## args) - -/* Macros for variables that vary from capplet to capplet */ - -#define DEFAULT_MONIKER "archiver:sound-properties" -#define FACTORY_IID "OAFIID:Bonobo_Control_Capplet_sound_properties_Factory" -#define GLADE_FILE GLADE_DATADIR "/sound-properties.glade" -#define G_LOG_DOMAIN "sound-properties" - -#include <gnome.h> -#include <bonobo.h> - -#include <glade/glade.h> - -/* FIXME: We should really have a single bonobo-conf.h header */ - -#include <bonobo-conf/bonobo-config-database.h> -#include <bonobo-conf/bonobo-property-editor.h> -#include <bonobo-conf/bonobo-property-frame.h> - -/* Needed only for the sound capplet */ - -#include <stdlib.h> -#include <esd.h> -#include <sys/types.h> - -static BonoboControl *control = NULL; -static GladeXML *dialog; -static GtkWidget *widget; - -/* Capplet-specific prototypes */ - -static void start_esd (void); - -/* apply_settings - * - * Apply the settings of the property bag. This function is per-capplet, though - * there are some cases where it does not do anything. - */ - -static void -apply_settings (Bonobo_ConfigDatabase db, CORBA_Environment *ev) -{ - CORBA_any *value; - - value = Bonobo_ConfigDatabase_getValue (db, "enable_esd", NULL, ev); - - if (BONOBO_EX (ev)) return; - - if (BONOBO_ARG_GET_BOOLEAN (value) && gnome_sound_connection < 0) - start_esd (); - - /* I'm not going to deal with reloading samples until later. It's - * entirely too painful */ -} - -/* start_esd - * - * Start the Enlightenment Sound Daemon. This function is specific to the sound - * properties capplet. - */ - -static void -start_esd (void) -{ -#ifdef HAVE_ESD - int esdpid; - static const char *esd_cmdline[] = {"esd", "-nobeeps", NULL}; - char *tmpargv[3]; - char argbuf[32]; - time_t starttime; - GnomeClient *client = gnome_master_client (); - - esdpid = gnome_execute_async (NULL, 2, (char **)esd_cmdline); - g_snprintf (argbuf, sizeof (argbuf), "%d", esdpid); - tmpargv[0] = "kill"; tmpargv[1] = argbuf; tmpargv[2] = NULL; - gnome_client_set_shutdown_command (client, 2, tmpargv); - starttime = time (NULL); - gnome_sound_init (NULL); - - while (gnome_sound_connection < 0 - && ((time(NULL) - starttime) < 4)) - { -#ifdef HAVE_USLEEP - usleep(1000); -#endif - gnome_sound_init(NULL); - } -#endif -} - -/* get_moniker_cb - * - * Callback issued to retrieve the name of the moniker being used. This function - * is just a formality and does not vary between capplets - */ - -static void -get_moniker_cb (BonoboPropertyBag *bag, BonoboArg *arg, guint arg_id, - CORBA_Environment *ev, BonoboControl *control) -{ - BONOBO_ARG_SET_STRING (arg, gtk_object_get_data (GTK_OBJECT (control), "moniker")); -} - -/* set_moniker_cb - * - * Callback issued when the name of the moniker to be used is set. This function - * does most of the dirty work -- creating the property editors that connect - * properties to the dialog box. The portion of this function appropriately - * labelled must be written once for each capplet. - */ - -/* Macro to make it easier to reference Glade widgets */ - -#define WID(s) glade_xml_get_widget (dialog, s) - -static void -set_moniker_cb (BonoboPropertyBag *bag, BonoboArg *arg, guint arg_id, - CORBA_Environment *ev, BonoboControl *control) -{ - gchar *moniker; - BonoboPropertyEditor *ed; - BonoboPropertyFrame *pf; - Bonobo_PropertyBag proxy; - GladeXML *dialog; - - if (arg_id != 1) return; - - moniker = BONOBO_ARG_GET_STRING (arg); - - pf = BONOBO_PROPERTY_FRAME (bonobo_control_get_widget (control)); - bonobo_property_frame_set_moniker (pf, moniker); - proxy = BONOBO_OBJREF (pf->proxy); - dialog = gtk_object_get_data (GTK_OBJECT (control), "dialog"); - - /* Begin per-capplet part */ - - ed = BONOBO_PROPERTY_EDITOR (bonobo_peditor_boolean_construct (WID ("enable_toggle"))); - bonobo_property_editor_set_property (ed, proxy, "start_esd", TC_boolean, NULL); - - ed = BONOBO_PROPERTY_EDITOR (bonobo_peditor_boolean_construct (WID ("events_toggle"))); - bonobo_property_editor_set_property (ed, proxy, "event_sounds", TC_boolean, NULL); - - /* End per-capplet part */ -} - -/* close_cb - * - * Callback issued when the dialog is destroyed. Just resets the control pointer - * to NULL so that the program does not think the dialog exists when it does - * not. Does not vary from capplet to capplet. - */ - -static void -close_cb (void) -{ - gtk_widget_destroy (widget); - gtk_object_destroy (GTK_OBJECT (dialog)); - control = NULL; -} - -/* create_dialog_cb - * - * Callback to construct the main dialog box for this capplet; invoked by Bonobo - * whenever capplet activation is requested. Returns a BonoboObject representing - * the control that encapsulates the object. This function should not vary from - * capplet to capplet, though it assumes that the dialog data in the glade file - * has the name "prefs_widget". */ - -static BonoboObject * -create_dialog_cb (BonoboGenericFactory *factory, gpointer data) -{ - BonoboPropertyBag *pb; - GtkWidget *pf; - - if (control == NULL) { - DEBUG_MSG ("Creating control"); - - dialog = glade_xml_new (GLADE_FILE, "prefs_widget"); - - if (dialog == NULL) { - g_critical ("Could not load glade file"); - return NULL; - } - - widget = glade_xml_get_widget (dialog, "prefs_widget"); - - if (widget == NULL) { - g_critical ("Could not find preferences widget"); - return NULL; - } - - DEBUG_MSG ("Loaded dialog: %p, %p", dialog, widget); - - pf = bonobo_property_frame_new (NULL, NULL); - gtk_container_add (GTK_CONTAINER (pf), widget); - gtk_widget_show_all (pf); - - control = bonobo_control_new (pf); - gtk_object_set_data (GTK_OBJECT (control), "dialog", dialog); - - pb = bonobo_property_bag_new ((BonoboPropertyGetFn) get_moniker_cb, - (BonoboPropertySetFn) set_moniker_cb, - control); - bonobo_control_set_properties (control, pb); - bonobo_object_unref (BONOBO_OBJECT (pb)); - - bonobo_property_bag_add (pb, "moniker", 1, BONOBO_ARG_STRING, NULL, - "Moniker for configuration", - BONOBO_PROPERTY_WRITEABLE); - - bonobo_control_set_automerge (control, TRUE); - - gtk_signal_connect (GTK_OBJECT (widget), "destroy", - GTK_SIGNAL_FUNC (close_cb), NULL); - gtk_signal_connect (GTK_OBJECT (control), "destroy", - GTK_SIGNAL_FUNC (close_cb), NULL); - } else { - gtk_widget_show_all (widget); - } - - return BONOBO_OBJECT (control); -} - -/* main -- This function should not vary from capplet to capplet - * - * FIXME: Should there be this much code in main()? Seems a tad complicated; - * some of it could be factored into a library, but which library should we use? - * libcapplet is to be deprecated, so we don't want to use that, and it doesn't - * seem right to use bonobo-conf for this purpose. - * - * *sigh*. I have a headache. - */ - -int -main (int argc, char **argv) -{ - BonoboGenericFactory *factory; - Bonobo_ConfigDatabase db; - CORBA_ORB orb; - CORBA_Environment ev; - - static gboolean apply_only; - static struct poptOption cap_options[] = { - { "apply", '\0', POPT_ARG_NONE, &apply_only, 0, - N_("Just apply settings and quit"), NULL }, - { NULL, '\0', 0, NULL, 0, NULL, NULL } - }; - - bindtextdomain (PACKAGE, GNOMELOCALEDIR); - textdomain (PACKAGE); - - glade_gnome_init (); - gnomelib_register_popt_table (cap_options, _("Capplet options")); - gnome_init_with_popt_table (argv[0], VERSION, argc, argv, - oaf_popt_options, 0, NULL); - - orb = oaf_init (argc, argv); - if (bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE) - g_error ("Cannot initialize bonobo"); - - if (apply_only) { - CORBA_exception_init (&ev); - db = bonobo_get_object (DEFAULT_MONIKER, - "IDL:Bonobo/ConfigDatabase:1.0", &ev); - - if (db == CORBA_OBJECT_NIL) { - g_critical ("Cannot open configuration database"); - return -1; - } - - apply_settings (db, &ev); - - CORBA_exception_free (&ev); - } else { - factory = bonobo_generic_factory_new - (FACTORY_IID, (BonoboGenericFactoryFn) create_dialog_cb, NULL); - bonobo_running_context_auto_exit_unref (BONOBO_OBJECT (factory)); - bonobo_main (); - } - - return 0; -} diff --git a/configure.in b/configure.in index 574a01da9..5126bf0e0 100644 --- a/configure.in +++ b/configure.in @@ -1,4 +1,4 @@ -AC_INIT(new-control-center) +AC_INIT(control-center) AM_CONFIG_HEADER(config.h) AM_INIT_AUTOMAKE(control-center, 1.3.1) @@ -116,6 +116,8 @@ PKG_CHECK_MODULES(ROLLBACK_CAPPLET, $capplet_modules) PKG_CHECK_MODULES(VFS_CAPPLET, $capplet_modules) PKG_CHECK_MODULES(GNOMECC, gnomeui libglade xml gdk_pixbuf capplet gnomecanvaspixbuf gtkhtml) PKG_CHECK_MODULES(RMHELPER, gnomeui gnomecanvaspixbuf) +PKG_CHECK_MODULES(ARCHIVER, bonobo xml) +PKG_CHECK_MODULES(MONIKER, bonobo bonobo_conf xml) dnl gnome-vfs doesn't support gnome-config or pkg-config VFS_CFLAGS=`gnome-vfs-config --cflags` @@ -128,29 +130,18 @@ AC_SUBST(CFLAGS) AC_SUBST(LDFLAGS) AC_OUTPUT([ - control-center.spec Makefile po/Makefile.in -new-control-center/Makefile +archiver/Makefile +control-center/Makefile root-manager/Makefile capplets/Makefile -capplets/mime-type/Makefile -capplets/desktop-links/Makefile -capplets/orbit-settings/Makefile -capplets/new-background-properties/Makefile -capplets/new-bell-properties/Makefile -capplets/new-keyboard-properties/Makefile -capplets/new-mouse-properties/Makefile -capplets/new-screensaver-properties/Makefile -capplets/new-screensaver-properties/screensavers/Makefile -capplets/new-sound-properties/Makefile -capplets/new-ui-properties/Makefile -capplets/session-properties/Makefile -capplets/theme-switcher/Makefile -capplets/url-properties/Makefile -capplets/gnome-edit-properties/Makefile -capplets/wm-properties/Makefile -capplets/wm-properties/wm-desktops/Makefile +capplets/background/Makefile +capplets/keyboard/Makefile +capplets/mouse/Makefile capplets/rollback/Makefile +capplets/screensaver/Makefile +capplets/screensaver/screensavers/Makefile +capplets/sound/Makefile intl/Makefile]) diff --git a/po/POTFILES.in b/po/POTFILES.in index 8cabb30f5..9fa23fd29 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,85 +1,64 @@ -capplets/file-types/file-types-capplet.desktop.in -capplets/gnome-edit-properties/gnome-edit-properties.c -capplets/mime-type/edit-window.c -capplets/mime-type/mime-data.c -capplets/mime-type/mime-info.c -capplets/mime-type/mime-type-capplet.c -capplets/mime-type/new-mime-window.c -capplets/new-background-properties/applier.c -capplets/new-background-properties/background-properties.glade.h -capplets/new-background-properties/prefs-widget.c -capplets/new-bell-properties/bell-properties.glade.h -capplets/new-keyboard-properties/keyboard-properties.glade.h -capplets/new-mouse-properties/mouse-properties.glade.h -capplets/new-screensaver-properties/preferences.c -capplets/new-screensaver-properties/prefs-widget.c -capplets/new-screensaver-properties/screensaver-prefs-dialog.c -capplets/new-screensaver-properties/screensavers/3d_clock.xml.h -capplets/new-screensaver-properties/screensavers/ant.xml.h -capplets/new-screensaver-properties/screensavers/attraction.xml.h -capplets/new-screensaver-properties/screensavers/blitspin.xml.h -capplets/new-screensaver-properties/screensavers/bouboule.xml.h -capplets/new-screensaver-properties/screensavers/braid.xml.h -capplets/new-screensaver-properties/screensavers/bsod.xml.h -capplets/new-screensaver-properties/screensavers/bubbles.xml.h -capplets/new-screensaver-properties/screensavers/compass.xml.h -capplets/new-screensaver-properties/screensavers/coral.xml.h -capplets/new-screensaver-properties/screensavers/crystal.xml.h -capplets/new-screensaver-properties/screensavers/cynosure.xml.h -capplets/new-screensaver-properties/screensavers/decayscreen.xml.h -capplets/new-screensaver-properties/screensavers/deco.xml.h -capplets/new-screensaver-properties/screensavers/discrete.xml.h -capplets/new-screensaver-properties/screensavers/drift.xml.h -capplets/new-screensaver-properties/screensavers/epicycle.xml.h -capplets/new-screensaver-properties/screensavers/fadeplot.xml.h -capplets/new-screensaver-properties/screensavers/flag.xml.h -capplets/new-screensaver-properties/screensavers/flame.xml.h -capplets/new-screensaver-properties/screensavers/forest.xml.h -capplets/new-screensaver-properties/screensavers/goop.xml.h -capplets/new-screensaver-properties/screensavers/grav.xml.h -capplets/new-screensaver-properties/screensavers/greynetic.xml.h -capplets/new-screensaver-properties/screensavers/halo.xml.h -capplets/new-screensaver-properties/screensavers/helix.xml.h -capplets/new-screensaver-properties/screensavers/hopalong.xml.h -capplets/new-screensaver-properties/screensavers/hypercube.xml.h -capplets/new-screensaver-properties/screensavers/ifs.xml.h -capplets/new-screensaver-properties/screensavers/jigsaw.xml.h -capplets/new-screensaver-properties/screensavers/julia.xml.h -capplets/new-screensaver-properties/screensavers/kaleidescope.xml.h -capplets/new-screensaver-properties/screensavers/laser.xml.h -capplets/new-screensaver-properties/screensavers/lightning.xml.h -capplets/new-screensaver-properties/screensavers/lisa.xml.h -capplets/new-screensaver-properties/screensavers/lmorph.xml.h -capplets/new-screensaver-properties/screensavers/maze.xml.h -capplets/new-screensaver-properties/screensavers/moire.xml.h -capplets/new-screensaver-properties/screensavers/munch.xml.h -capplets/new-screensaver-properties/screensavers/pedal.xml.h -capplets/new-screensaver-properties/screensavers/pyro.xml.h -capplets/new-screensaver-properties/screensavers/qix.xml.h -capplets/new-screensaver-properties/screensavers/rorschach.xml.h -capplets/new-screensaver-properties/screensavers/sierpinski.xml.h -capplets/new-screensaver-properties/screensavers/spiral.xml.h -capplets/new-screensaver-properties/screensavers/starfish.xml.h -capplets/new-screensaver-properties/screensavers/triangle.xml.h -capplets/new-screensaver-properties/screensavers/vines.xml.h -capplets/new-screensaver-properties/screensavers/xroger.xml.h -capplets/new-screensaver-properties/selection-dialog.c -capplets/new-sound-properties/prefs-widget.c -capplets/new-sound-properties/sound-properties.glade.h -capplets/new-ui-properties/ui-properties.glade.h -capplets/session-properties/chooser.c -capplets/session-properties/gsm-client-editor.c -capplets/session-properties/gsm-client-list.c -capplets/session-properties/gsm-client-row.c -capplets/session-properties/gsm-protocol.c -capplets/session-properties/session-properties.c -capplets/session-properties/startup-programs.c -capplets/theme-switcher/demo.c -capplets/theme-switcher/gui.c -capplets/theme-switcher/install.c -capplets/url-properties/url-properties.c -capplets/wm-properties/wm-properties-capplet.c -new-control-center/capplet-dir-view.c -new-control-center/gnomecc.glade.h +capplets/background/applier.c +capplets/background/background-properties.glade.h +capplets/background/prefs-widget.c +capplets/keyboard/keyboard-properties.glade.h +capplets/mouse/mouse-properties.glade.h +capplets/screensaver/preferences.c +capplets/screensaver/prefs-widget.c +capplets/screensaver/screensaver-prefs-dialog.c +capplets/screensaver/screensavers/3d_clock.xml.h +capplets/screensaver/screensavers/ant.xml.h +capplets/screensaver/screensavers/attraction.xml.h +capplets/screensaver/screensavers/blitspin.xml.h +capplets/screensaver/screensavers/bouboule.xml.h +capplets/screensaver/screensavers/braid.xml.h +capplets/screensaver/screensavers/bsod.xml.h +capplets/screensaver/screensavers/bubbles.xml.h +capplets/screensaver/screensavers/compass.xml.h +capplets/screensaver/screensavers/coral.xml.h +capplets/screensaver/screensavers/crystal.xml.h +capplets/screensaver/screensavers/cynosure.xml.h +capplets/screensaver/screensavers/decayscreen.xml.h +capplets/screensaver/screensavers/deco.xml.h +capplets/screensaver/screensavers/discrete.xml.h +capplets/screensaver/screensavers/drift.xml.h +capplets/screensaver/screensavers/epicycle.xml.h +capplets/screensaver/screensavers/fadeplot.xml.h +capplets/screensaver/screensavers/flag.xml.h +capplets/screensaver/screensavers/flame.xml.h +capplets/screensaver/screensavers/forest.xml.h +capplets/screensaver/screensavers/goop.xml.h +capplets/screensaver/screensavers/grav.xml.h +capplets/screensaver/screensavers/greynetic.xml.h +capplets/screensaver/screensavers/halo.xml.h +capplets/screensaver/screensavers/helix.xml.h +capplets/screensaver/screensavers/hopalong.xml.h +capplets/screensaver/screensavers/hypercube.xml.h +capplets/screensaver/screensavers/ifs.xml.h +capplets/screensaver/screensavers/jigsaw.xml.h +capplets/screensaver/screensavers/julia.xml.h +capplets/screensaver/screensavers/kaleidescope.xml.h +capplets/screensaver/screensavers/laser.xml.h +capplets/screensaver/screensavers/lightning.xml.h +capplets/screensaver/screensavers/lisa.xml.h +capplets/screensaver/screensavers/lmorph.xml.h +capplets/screensaver/screensavers/maze.xml.h +capplets/screensaver/screensavers/moire.xml.h +capplets/screensaver/screensavers/munch.xml.h +capplets/screensaver/screensavers/pedal.xml.h +capplets/screensaver/screensavers/pyro.xml.h +capplets/screensaver/screensavers/qix.xml.h +capplets/screensaver/screensavers/rorschach.xml.h +capplets/screensaver/screensavers/sierpinski.xml.h +capplets/screensaver/screensavers/spiral.xml.h +capplets/screensaver/screensavers/starfish.xml.h +capplets/screensaver/screensavers/triangle.xml.h +capplets/screensaver/screensavers/vines.xml.h +capplets/screensaver/screensavers/xroger.xml.h +capplets/screensaver/selection-dialog.c +capplets/sound/prefs-widget.c +capplets/sound/sound-properties.glade.h +control-center/capplet-dir-view.c +control-center/gnomecc.glade.h root-manager/root-manager.c root-manager/root-manager-wrap.c |