seahorse r2633 - in trunk: . gkr po
- From: nnielsen svn gnome org
- To: svn-commits-list gnome org
- Subject: seahorse r2633 - in trunk: . gkr po
- Date: Sun, 23 Nov 2008 15:07:16 +0000 (UTC)
Author: nnielsen
Date: Sun Nov 23 15:07:15 2008
New Revision: 2633
URL: http://svn.gnome.org/viewvc/seahorse?rev=2633&view=rev
Log:
* gkr/libseahorse-gkr-c.vapi: (removed)
* gkr/Makefile.am:
* gkr/seahorse-gkeyring-item.c: (moved to seahorse-gkr-item.c)
* gkr/seahorse-gkeyring-item.h: (moved to seahorse-gkr-item.h)
* gkr/seahorse-gkeyring-item-properties.c: (moved to seahorse-gkr-item-properties.c)
* gkr/seahorse-gkeyring-item-properties.glade: (moved to seahorse-gkr-item-properties.glade)
* gkr/seahorse-gkeyring-operation.c: (moved to seahorse-gkr-operation.c)
* gkr/seahorse-gkeyring-operation.h: (moved to seahorse-gkr-operation.h)
* gkr/seahorse-gkeyring-source.c: (moved to seahorse-gkr-source.c)
* gkr/seahorse-gkeyring-source.h: (moved to seahorse-gkr-source.h)
* gkr/seahorse-gkr.c:
* gkr/seahorse-gkr.h:
* gkr/seahorse-gkr.vala: (removed)
* gkr/seahorse-gkr-commands.c:
* gkr/seahorse-gkr-commands.h:
* gkr/seahorse-gkr-commands.vala:
* gkr/seahorse-gkr-dialogs.h:
* gkr/seahorse-gkr-item.c: (moved from seahorse-gkeyring-item.c)
* gkr/seahorse-gkr-item.h: (moved from seahorse-gkeyring-item.h)
* gkr/seahorse-gkr-item-properties.c: (moved from seahorse-gkeyring-item-properties.c)
* gkr/seahorse-gkr-item-properties.glade: (moved from seahorse-gkeyring-item-properties.glade)
* gkr/seahorse-gkr-module.c:
* gkr/seahorse-gkr-operation.c: (moved from seahorse-gkeyring-operation.c)
* gkr/seahorse-gkr-operation.h: (moved from seahorse-gkeyring-operation.h)
* gkr/seahorse-gkr-source.c: (moved from seahorse-gkr-source.c)
* gkr/seahorse-gkr-source.h: (moved from seahorse-gkr-source.h)
Make all of gnome-keyring component in the same namespace, and remove vala usage.
Added:
trunk/gkr/seahorse-gkr-item-properties.c (contents, props changed)
- copied, changed from r2629, /trunk/gkr/seahorse-gkeyring-item-properties.c
trunk/gkr/seahorse-gkr-item-properties.glade (contents, props changed)
- copied, changed from r2629, /trunk/gkr/seahorse-gkeyring-item-properties.glade
trunk/gkr/seahorse-gkr-item.c (contents, props changed)
- copied, changed from r2629, /trunk/gkr/seahorse-gkeyring-item.c
trunk/gkr/seahorse-gkr-item.h (contents, props changed)
- copied, changed from r2629, /trunk/gkr/seahorse-gkeyring-item.h
trunk/gkr/seahorse-gkr-operation.c (contents, props changed)
- copied, changed from r2629, /trunk/gkr/seahorse-gkeyring-operation.c
trunk/gkr/seahorse-gkr-operation.h (contents, props changed)
- copied, changed from r2629, /trunk/gkr/seahorse-gkeyring-operation.h
trunk/gkr/seahorse-gkr-source.c (contents, props changed)
- copied, changed from r2629, /trunk/gkr/seahorse-gkeyring-source.c
trunk/gkr/seahorse-gkr-source.h (contents, props changed)
- copied, changed from r2629, /trunk/gkr/seahorse-gkeyring-source.h
Removed:
trunk/gkr/libseahorse-gkr-c.vapi
trunk/gkr/seahorse-gkeyring-item-properties.c
trunk/gkr/seahorse-gkeyring-item-properties.glade
trunk/gkr/seahorse-gkeyring-item.c
trunk/gkr/seahorse-gkeyring-item.h
trunk/gkr/seahorse-gkeyring-operation.c
trunk/gkr/seahorse-gkeyring-operation.h
trunk/gkr/seahorse-gkeyring-source.c
trunk/gkr/seahorse-gkeyring-source.h
trunk/gkr/seahorse-gkr-commands.vala
trunk/gkr/seahorse-gkr.vala
trunk/gkr/vala-build.stamp
Modified:
trunk/ChangeLog
trunk/gkr/Makefile.am
trunk/gkr/seahorse-gkr-commands.c
trunk/gkr/seahorse-gkr-commands.h
trunk/gkr/seahorse-gkr-dialogs.h
trunk/gkr/seahorse-gkr-module.c
trunk/gkr/seahorse-gkr.c
trunk/gkr/seahorse-gkr.h
trunk/po/ChangeLog
trunk/po/POTFILES.in
trunk/po/POTFILES.skip
Modified: trunk/gkr/Makefile.am
==============================================================================
--- trunk/gkr/Makefile.am (original)
+++ trunk/gkr/Makefile.am Sun Nov 23 15:07:15 2008
@@ -15,39 +15,17 @@
-DLIBCRYPTUI_API_SUBJECT_TO_CHANGE \
-DGETTEXT_PACKAGE=\""seahorse\""
-VALA_SRCS = \
- seahorse-gkr.vala \
- seahorse-gkr-commands.vala
-
-VALA_VAPIS = \
- libseahorse-gkr-c.vapi \
- $(top_srcdir)/bugs.vapi \
- $(top_srcdir)/config.vapi \
- $(top_srcdir)/libseahorse/libseahorse-c.vapi \
- $(top_srcdir)/libseahorse/libseahorse.vapi
-
-VALA_CFILES = $(VALA_SRCS:.vala=.c)
-VALA_HFILES = $(VALA_SRCS:.vala=.h)
-
-SUFFIXES = .vala .c .h
-
-vala-build.stamp: $(VALA_SRCS) $(VALA_VAPIS)
- $(VALAC) -C $(VALA_PKGS) $(VALA_VAPIS) $(VALA_SRCS)
- date +'%s' > $@
-
-BUILT_SOURCES = \
- vala-build.stamp
-
noinst_LTLIBRARIES = libseahorse-gkr.la
libseahorse_gkr_la_SOURCES = \
- seahorse-gkr-module.c seahorse-gkr-module.h \
+ seahorse-gkr.c seahorse-gkr.h \
+ seahorse-gkr-commands.c seahorse-gkr-commands.h \
seahorse-gkr-dialogs.h \
- seahorse-gkeyring-item.c seahorse-gkeyring-item.h \
- seahorse-gkeyring-source.c seahorse-gkeyring-source.h \
- seahorse-gkeyring-operation.c seahorse-gkeyring-operation.h \
- seahorse-gkeyring-item-properties.c \
- $(VALA_CFILES) $(VALA_HFILES)
+ seahorse-gkr-item.c seahorse-gkr-item.h \
+ seahorse-gkr-item-properties.c \
+ seahorse-gkr-module.c seahorse-gkr-module.h \
+ seahorse-gkr-operation.c seahorse-gkr-operation.h \
+ seahorse-gkr-source.c seahorse-gkr-source.h
libseahorse_gkr_la_LIBADD = \
$(top_builddir)/libseahorse/libseahorse.la \
@@ -55,15 +33,8 @@
$(top_builddir)/libcryptui/libcryptui.la
glade_DATA = \
- seahorse-gkeyring-item-properties.glade
+ seahorse-gkr-item-properties.glade
EXTRA_DIST = \
- $(glade_DATA) \
- libseahorse-gkr-c.vapi \
- vala-build.stamp \
- $(VALA_CFILES) $(VALA_HFILES) \
- $(VALA_SRCS)
-
-vala-clean:
- rm -f vala-build.stamp $(VALA_CFILES) $(VALA_HFILES)
+ $(glade_DATA)
Modified: trunk/gkr/seahorse-gkr-commands.c
==============================================================================
--- trunk/gkr/seahorse-gkr-commands.c (original)
+++ trunk/gkr/seahorse-gkr-commands.c Sun Nov 23 15:07:15 2008
@@ -19,172 +19,224 @@
* 02111-1307, USA.
*/
+#include "config.h"
+
#include "seahorse-gkr-commands.h"
-#include <seahorse-gkr-dialogs.h>
-#include <seahorse-gkeyring-item.h>
-#include <seahorse-view.h>
-#include <glib/gi18n-lib.h>
-#include <seahorse-util.h>
-#include <seahorse-source.h>
-#include <common/seahorse-registry.h>
+
#include "seahorse-gkr.h"
+#include "seahorse-gkr-item.h"
+#include "seahorse-gkr-dialogs.h"
+#include "common/seahorse-registry.h"
+#include "seahorse-source.h"
+#include "seahorse-util.h"
+#include <glib/gi18n.h>
-struct _SeahorseGKeyringCommandsPrivate {
- GtkActionGroup* _actions;
+enum {
+ PROP_0,
+ PROP_KTYPE,
+ PROP_UI_DEFINITION,
+ PROP_COMMAND_ACTIONS
};
-#define SEAHORSE_GKEYRING_COMMANDS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SEAHORSE_GKEYRING_TYPE_COMMANDS, SeahorseGKeyringCommandsPrivate))
-enum {
- SEAHORSE_GKEYRING_COMMANDS_DUMMY_PROPERTY,
- SEAHORSE_GKEYRING_COMMANDS_KTYPE,
- SEAHORSE_GKEYRING_COMMANDS_UI_DEFINITION,
- SEAHORSE_GKEYRING_COMMANDS_COMMAND_ACTIONS
+struct _SeahorseGkrCommandsPrivate {
+ GtkActionGroup* command_actions;
};
-static void seahorse_gkeyring_commands_real_show_properties (SeahorseCommands* base, SeahorseObject* key);
-static SeahorseOperation* seahorse_gkeyring_commands_real_delete_objects (SeahorseCommands* base, GList* keys);
-static gpointer seahorse_gkeyring_commands_parent_class = NULL;
-static void seahorse_gkeyring_commands_finalize (GObject * obj);
+G_DEFINE_TYPE (SeahorseGkrCommands, seahorse_gkr_commands, SEAHORSE_TYPE_COMMANDS);
+#define SEAHORSE_GKR_COMMANDS_GET_PRIVATE(o) \
+ (G_TYPE_INSTANCE_GET_PRIVATE ((o), SEAHORSE_TYPE_GKR_COMMANDS, SeahorseGkrCommandsPrivate))
-static void seahorse_gkeyring_commands_real_show_properties (SeahorseCommands* base, SeahorseObject* key) {
- SeahorseGKeyringCommands * self;
- self = SEAHORSE_GKEYRING_COMMANDS (base);
- g_return_if_fail (SEAHORSE_IS_OBJECT (key));
- g_return_if_fail (seahorse_object_get_tag (key) == SEAHORSE_GKEYRING_TYPE);
- seahorse_gkeyring_item_properties_show (SEAHORSE_GKEYRING_ITEM (key), seahorse_view_get_window (seahorse_commands_get_view (SEAHORSE_COMMANDS (self))));
-}
+/* -----------------------------------------------------------------------------
+ * INTERNAL
+ */
+/* -----------------------------------------------------------------------------
+ * OBJECT
+ */
-static SeahorseOperation* seahorse_gkeyring_commands_real_delete_objects (SeahorseCommands* base, GList* keys) {
- SeahorseGKeyringCommands * self;
+static void
+seahorse_gkr_commands_show_properties (SeahorseCommands* base, SeahorseObject* object)
+{
+ g_return_if_fail (SEAHORSE_IS_OBJECT (object));
+ g_return_if_fail (seahorse_object_get_tag (object) == SEAHORSE_GKR_TYPE);
+
+ seahorse_gkr_item_properties_show (SEAHORSE_GKR_ITEM (object),
+ seahorse_view_get_window (seahorse_commands_get_view (base)));
+}
+
+static SeahorseOperation*
+seahorse_gkr_commands_delete_objects (SeahorseCommands* base, GList* objects)
+{
+ gchar *prompt, *display;
+ GtkWidget *parent;
+ gboolean ret;
guint num;
- char* prompt;
- SeahorseOperation* _tmp4;
- self = SEAHORSE_GKEYRING_COMMANDS (base);
- g_return_val_if_fail (keys != NULL, NULL);
- num = g_list_length (keys);
- if (num == 0) {
+
+ num = g_list_length (objects);
+ if (num == 0)
return NULL;
- }
- prompt = NULL;
+
if (num == 1) {
- char* _tmp1;
- _tmp1 = NULL;
- prompt = (_tmp1 = g_strdup_printf (_ ("Are you sure you want to delete the password '%s'?"), seahorse_object_get_display_name (((SeahorseObject*) (((SeahorseObject*) (keys->data)))))), (prompt = (g_free (prompt), NULL)), _tmp1);
+ display = seahorse_object_get_display_name (SEAHORSE_OBJECT (objects->data));
+ prompt = g_strdup_printf (_ ("Are you sure you want to delete the password '%s'?"), display);
+ g_free (display);
} else {
- char* _tmp2;
- _tmp2 = NULL;
- prompt = (_tmp2 = g_strdup_printf (ngettext ("Are you sure you want to delete %d password?", "Are you sure you want to delete %d passwords?", ((gint) (num))), num), (prompt = (g_free (prompt), NULL)), _tmp2);
- }
- if (!seahorse_util_prompt_delete (prompt, GTK_WIDGET (seahorse_view_get_window (seahorse_commands_get_view (SEAHORSE_COMMANDS (self)))))) {
- SeahorseOperation* _tmp3;
- _tmp3 = NULL;
- return (_tmp3 = NULL, (prompt = (g_free (prompt), NULL)), _tmp3);
- }
- _tmp4 = NULL;
- return (_tmp4 = seahorse_source_delete_objects (keys), (prompt = (g_free (prompt), NULL)), _tmp4);
-}
-
+ prompt = g_strdup_printf (ngettext ("Are you sure you want to delete %d password?",
+ "Are you sure you want to delete %d passwords?",
+ num), num);
+ }
+
+ parent = GTK_WIDGET (seahorse_view_get_window (seahorse_commands_get_view (base)));
+ ret = seahorse_util_prompt_delete (prompt, parent);
+ g_free (prompt);
+
+ if (!ret)
+ return NULL;
-SeahorseGKeyringCommands* seahorse_gkeyring_commands_new (void) {
- SeahorseGKeyringCommands * self;
- self = g_object_newv (SEAHORSE_GKEYRING_TYPE_COMMANDS, 0, NULL);
- return self;
+ return seahorse_source_delete_objects (objects);
}
-
-static GQuark seahorse_gkeyring_commands_real_get_ktype (SeahorseCommands* base) {
- SeahorseGKeyringCommands* self;
- self = SEAHORSE_GKEYRING_COMMANDS (base);
- return SEAHORSE_GKEYRING_TYPE;
+static GQuark
+seahorse_gkr_commands_get_ktype (SeahorseCommands* base)
+{
+ return SEAHORSE_GKR_TYPE;
}
-static const char* seahorse_gkeyring_commands_real_get_ui_definition (SeahorseCommands* base) {
- SeahorseGKeyringCommands* self;
- self = SEAHORSE_GKEYRING_COMMANDS (base);
+static const gchar*
+seahorse_gkr_commands_get_ui_definition (SeahorseCommands* base)
+{
return "";
}
-static GtkActionGroup* seahorse_gkeyring_commands_real_get_command_actions (SeahorseCommands* base) {
- SeahorseGKeyringCommands* self;
- self = SEAHORSE_GKEYRING_COMMANDS (base);
- if (self->priv->_actions == NULL) {
- GtkActionGroup* _tmp0;
- _tmp0 = NULL;
- self->priv->_actions = (_tmp0 = gtk_action_group_new ("gkr"), (self->priv->_actions == NULL ? NULL : (self->priv->_actions = (g_object_unref (self->priv->_actions), NULL))), _tmp0);
+static GtkActionGroup*
+seahorse_gkr_commands_get_command_actions (SeahorseCommands* base)
+{
+ SeahorseGkrCommandsPrivate* pv = SEAHORSE_GKR_COMMANDS_GET_PRIVATE(base);
+ return pv->command_actions;
+}
+
+static GObject*
+seahorse_gkr_commands_constructor (GType type, guint n_props, GObjectConstructParam *props)
+{
+ GObject *obj = G_OBJECT_CLASS (seahorse_gkr_commands_parent_class)->constructor (type, n_props, props);
+ SeahorseGkrCommands *self = NULL;
+ SeahorseGkrCommandsPrivate *pv;
+
+ if (obj) {
+ pv = SEAHORSE_GKR_COMMANDS_GET_PRIVATE (obj);
+ self = SEAHORSE_GKR_COMMANDS (obj);
+
+ }
+
+ return obj;
+}
+
+static void
+seahorse_gkr_commands_init (SeahorseGkrCommands *self)
+{
+ SeahorseGkrCommandsPrivate *pv = SEAHORSE_GKR_COMMANDS_GET_PRIVATE (self);
+ pv->command_actions = gtk_action_group_new ("gkr");
+}
+
+static void
+seahorse_gkr_commands_dispose (GObject *obj)
+{
+ SeahorseGkrCommands *self = SEAHORSE_GKR_COMMANDS (obj);
+ SeahorseGkrCommandsPrivate *pv = SEAHORSE_GKR_COMMANDS_GET_PRIVATE (self);
+
+ if (pv->command_actions)
+ g_object_unref (pv->command_actions);
+ pv->command_actions = NULL;
+
+ G_OBJECT_CLASS (seahorse_gkr_commands_parent_class)->dispose (obj);
+}
+
+static void
+seahorse_gkr_commands_finalize (GObject *obj)
+{
+ SeahorseGkrCommands *self = SEAHORSE_GKR_COMMANDS (obj);
+ SeahorseGkrCommandsPrivate *pv = SEAHORSE_GKR_COMMANDS_GET_PRIVATE (self);
+
+ g_assert (!pv->command_actions);
+
+ G_OBJECT_CLASS (seahorse_gkr_commands_parent_class)->finalize (obj);
+}
+
+static void
+seahorse_gkr_commands_set_property (GObject *obj, guint prop_id, const GValue *value,
+ GParamSpec *pspec)
+{
+ switch (prop_id) {
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, pspec);
+ break;
}
- return self->priv->_actions;
}
-
-static void seahorse_gkeyring_commands_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) {
- SeahorseGKeyringCommands * self;
- self = SEAHORSE_GKEYRING_COMMANDS (object);
- switch (property_id) {
- case SEAHORSE_GKEYRING_COMMANDS_KTYPE:
- g_value_set_uint (value, seahorse_commands_get_ktype (SEAHORSE_COMMANDS (self)));
+static void
+seahorse_gkr_commands_get_property (GObject *obj, guint prop_id, GValue *value,
+ GParamSpec *pspec)
+{
+ SeahorseCommands *base = SEAHORSE_COMMANDS (obj);
+
+ switch (prop_id) {
+ case PROP_KTYPE:
+ g_value_set_uint (value, seahorse_commands_get_ktype (base));
break;
- case SEAHORSE_GKEYRING_COMMANDS_UI_DEFINITION:
- g_value_set_string (value, seahorse_commands_get_ui_definition (SEAHORSE_COMMANDS (self)));
+ case PROP_UI_DEFINITION:
+ g_value_set_string (value, seahorse_commands_get_ui_definition (base));
break;
- case SEAHORSE_GKEYRING_COMMANDS_COMMAND_ACTIONS:
- g_value_set_object (value, seahorse_commands_get_command_actions (SEAHORSE_COMMANDS (self)));
+ case PROP_COMMAND_ACTIONS:
+ g_value_set_object (value, seahorse_commands_get_command_actions (base));
break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, pspec);
break;
}
}
-
-static void seahorse_gkeyring_commands_class_init (SeahorseGKeyringCommandsClass * klass) {
- seahorse_gkeyring_commands_parent_class = g_type_class_peek_parent (klass);
- g_type_class_add_private (klass, sizeof (SeahorseGKeyringCommandsPrivate));
- G_OBJECT_CLASS (klass)->get_property = seahorse_gkeyring_commands_get_property;
- G_OBJECT_CLASS (klass)->finalize = seahorse_gkeyring_commands_finalize;
- SEAHORSE_COMMANDS_CLASS (klass)->show_properties = seahorse_gkeyring_commands_real_show_properties;
- SEAHORSE_COMMANDS_CLASS (klass)->delete_objects = seahorse_gkeyring_commands_real_delete_objects;
- SEAHORSE_COMMANDS_CLASS (klass)->get_ktype = seahorse_gkeyring_commands_real_get_ktype;
- SEAHORSE_COMMANDS_CLASS (klass)->get_ui_definition = seahorse_gkeyring_commands_real_get_ui_definition;
- SEAHORSE_COMMANDS_CLASS (klass)->get_command_actions = seahorse_gkeyring_commands_real_get_command_actions;
- g_object_class_override_property (G_OBJECT_CLASS (klass), SEAHORSE_GKEYRING_COMMANDS_KTYPE, "ktype");
- g_object_class_override_property (G_OBJECT_CLASS (klass), SEAHORSE_GKEYRING_COMMANDS_UI_DEFINITION, "ui-definition");
- g_object_class_override_property (G_OBJECT_CLASS (klass), SEAHORSE_GKEYRING_COMMANDS_COMMAND_ACTIONS, "command-actions");
- {
- /* Register this class as a commands */
- seahorse_registry_register_type (seahorse_registry_get (), SEAHORSE_GKEYRING_TYPE_COMMANDS, SEAHORSE_GKEYRING_TYPE_STR, "commands", NULL, NULL);
- }
-}
-
-
-static void seahorse_gkeyring_commands_instance_init (SeahorseGKeyringCommands * self) {
- self->priv = SEAHORSE_GKEYRING_COMMANDS_GET_PRIVATE (self);
-}
-
-
-static void seahorse_gkeyring_commands_finalize (GObject * obj) {
- SeahorseGKeyringCommands * self;
- self = SEAHORSE_GKEYRING_COMMANDS (obj);
- (self->priv->_actions == NULL ? NULL : (self->priv->_actions = (g_object_unref (self->priv->_actions), NULL)));
- G_OBJECT_CLASS (seahorse_gkeyring_commands_parent_class)->finalize (obj);
+static void
+seahorse_gkr_commands_class_init (SeahorseGkrCommandsClass *klass)
+{
+ GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+ SeahorseCommandsClass *cmd_class = SEAHORSE_COMMANDS_CLASS (klass);
+
+ seahorse_gkr_commands_parent_class = g_type_class_peek_parent (klass);
+ g_type_class_add_private (klass, sizeof (SeahorseGkrCommandsPrivate));
+
+ gobject_class->constructor = seahorse_gkr_commands_constructor;
+ gobject_class->dispose = seahorse_gkr_commands_dispose;
+ gobject_class->finalize = seahorse_gkr_commands_finalize;
+ gobject_class->set_property = seahorse_gkr_commands_set_property;
+ gobject_class->get_property = seahorse_gkr_commands_get_property;
+
+ cmd_class->show_properties = seahorse_gkr_commands_show_properties;
+ cmd_class->delete_objects = seahorse_gkr_commands_delete_objects;
+ cmd_class->get_ktype = seahorse_gkr_commands_get_ktype;
+ cmd_class->get_ui_definition = seahorse_gkr_commands_get_ui_definition;
+ cmd_class->get_command_actions = seahorse_gkr_commands_get_command_actions;
+
+ g_object_class_override_property (gobject_class, PROP_KTYPE, "ktype");
+ g_object_class_override_property (gobject_class, PROP_UI_DEFINITION, "ui-definition");
+ g_object_class_override_property (gobject_class, PROP_COMMAND_ACTIONS, "command-actions");
+
+ /* Register this class as a commands */
+ seahorse_registry_register_type (seahorse_registry_get (), SEAHORSE_TYPE_GKR_COMMANDS,
+ SEAHORSE_GKR_TYPE_STR, "commands", NULL, NULL);
}
+/* -----------------------------------------------------------------------------
+ * PUBLIC
+ */
-GType seahorse_gkeyring_commands_get_type (void) {
- static GType seahorse_gkeyring_commands_type_id = 0;
- if (seahorse_gkeyring_commands_type_id == 0) {
- static const GTypeInfo g_define_type_info = { sizeof (SeahorseGKeyringCommandsClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) seahorse_gkeyring_commands_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SeahorseGKeyringCommands), 0, (GInstanceInitFunc) seahorse_gkeyring_commands_instance_init };
- seahorse_gkeyring_commands_type_id = g_type_register_static (SEAHORSE_TYPE_COMMANDS, "SeahorseGKeyringCommands", &g_define_type_info, 0);
- }
- return seahorse_gkeyring_commands_type_id;
+SeahorseGkrCommands*
+seahorse_gkr_commands_new (void)
+{
+ return g_object_new (SEAHORSE_TYPE_GKR_COMMANDS, NULL);
}
-
-
-
-
Modified: trunk/gkr/seahorse-gkr-commands.h
==============================================================================
--- trunk/gkr/seahorse-gkr-commands.h (original)
+++ trunk/gkr/seahorse-gkr-commands.h Sun Nov 23 15:07:15 2008
@@ -22,43 +22,31 @@
#ifndef __SEAHORSE_GKR_COMMANDS_H__
#define __SEAHORSE_GKR_COMMANDS_H__
-#include <glib.h>
+#include "seahorse-commands.h"
+
#include <glib-object.h>
-#include <seahorse-commands.h>
-#include <seahorse-object.h>
-#include <seahorse-operation.h>
-#include <stdlib.h>
-#include <string.h>
-#include <gtk/gtk.h>
-
-G_BEGIN_DECLS
-
-
-#define SEAHORSE_GKEYRING_TYPE_COMMANDS (seahorse_gkeyring_commands_get_type ())
-#define SEAHORSE_GKEYRING_COMMANDS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_GKEYRING_TYPE_COMMANDS, SeahorseGKeyringCommands))
-#define SEAHORSE_GKEYRING_COMMANDS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_GKEYRING_TYPE_COMMANDS, SeahorseGKeyringCommandsClass))
-#define SEAHORSE_GKEYRING_IS_COMMANDS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_GKEYRING_TYPE_COMMANDS))
-#define SEAHORSE_GKEYRING_IS_COMMANDS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_GKEYRING_TYPE_COMMANDS))
-#define SEAHORSE_GKEYRING_COMMANDS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_GKEYRING_TYPE_COMMANDS, SeahorseGKeyringCommandsClass))
-
-typedef struct _SeahorseGKeyringCommands SeahorseGKeyringCommands;
-typedef struct _SeahorseGKeyringCommandsClass SeahorseGKeyringCommandsClass;
-typedef struct _SeahorseGKeyringCommandsPrivate SeahorseGKeyringCommandsPrivate;
-
-struct _SeahorseGKeyringCommands {
- SeahorseCommands parent_instance;
- SeahorseGKeyringCommandsPrivate * priv;
+
+#define SEAHORSE_TYPE_GKR_COMMANDS (seahorse_gkr_commands_get_type ())
+#define SEAHORSE_GKR_COMMANDS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_GKR_COMMANDS, SeahorseGkrCommands))
+#define SEAHORSE_GKR_COMMANDS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_GKR_COMMANDS, SeahorseGkrCommandsClass))
+#define SEAHORSE_IS_GKR_COMMANDS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_GKR_COMMANDS))
+#define SEAHORSE_IS_GKR_COMMANDS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_GKR_COMMANDS))
+#define SEAHORSE_GKR_COMMANDS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_GKR_COMMANDS, SeahorseGkrCommandsClass))
+
+typedef struct _SeahorseGkrCommands SeahorseGkrCommands;
+typedef struct _SeahorseGkrCommandsClass SeahorseGkrCommandsClass;
+typedef struct _SeahorseGkrCommandsPrivate SeahorseGkrCommandsPrivate;
+
+struct _SeahorseGkrCommands {
+ SeahorseCommands parent;
};
-struct _SeahorseGKeyringCommandsClass {
+struct _SeahorseGkrCommandsClass {
SeahorseCommandsClass parent_class;
};
+GType seahorse_gkr_commands_get_type (void);
-SeahorseGKeyringCommands* seahorse_gkeyring_commands_new (void);
-GType seahorse_gkeyring_commands_get_type (void);
-
-
-G_END_DECLS
+SeahorseGkrCommands* seahorse_gkr_commands_new (void);
-#endif
+#endif /* __SEAHORSE_GKR_COMMANDS_H__ */
Modified: trunk/gkr/seahorse-gkr-dialogs.h
==============================================================================
--- trunk/gkr/seahorse-gkr-dialogs.h (original)
+++ trunk/gkr/seahorse-gkr-dialogs.h Sun Nov 23 15:07:15 2008
@@ -1,12 +1,31 @@
+/*
+ * Seahorse
+ *
+ * Copyright (C) 2008 Stefan Walter
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser 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 __SEAHORSE_GKR_DIALOGS__
#define __SEAHORSE_GKR_DIALOGS__
#include <gtk/gtk.h>
-#include "seahorse-gkeyring-item.h"
+#include "seahorse-gkr-item.h"
-void seahorse_gkeyring_item_properties_show (SeahorseGKeyringItem *git,
- GtkWindow *parent);
+void seahorse_gkr_item_properties_show (SeahorseGkrItem *git, GtkWindow *parent);
#endif /* __SEAHORSE_GKR_DIALOGS__ */
Copied: trunk/gkr/seahorse-gkr-item-properties.c (from r2629, /trunk/gkr/seahorse-gkeyring-item-properties.c)
==============================================================================
--- /trunk/gkr/seahorse-gkeyring-item-properties.c (original)
+++ trunk/gkr/seahorse-gkr-item-properties.c Sun Nov 23 15:07:15 2008
@@ -29,22 +29,22 @@
#include "seahorse-secure-memory.h"
#include "seahorse-secure-entry.h"
-#include "gkr/seahorse-gkeyring-item.h"
-#include "gkr/seahorse-gkeyring-source.h"
-#include "gkr/seahorse-gkeyring-operation.h"
+#include "seahorse-gkr-item.h"
+#include "seahorse-gkr-source.h"
+#include "seahorse-gkr-operation.h"
/* -----------------------------------------------------------------------------
* MAIN TAB
*/
static void
-load_password (SeahorseWidget *swidget, SeahorseGKeyringItem *git)
+load_password (SeahorseWidget *swidget, SeahorseGkrItem *git)
{
SeahorseSecureEntry *entry;
gchar *secret;
entry = SEAHORSE_SECURE_ENTRY (g_object_get_data (G_OBJECT (swidget),
- "secure-password-entry"));
+ "secure-password-entry"));
if (entry) {
/* Retrieve initial password. Try to keep it safe */
@@ -60,7 +60,7 @@
do_main (SeahorseWidget *swidget)
{
SeahorseKey *key;
- SeahorseGKeyringItem *git;
+ SeahorseGkrItem *git;
GtkWidget *widget;
gchar *text;
const gchar *label;
@@ -68,7 +68,7 @@
gboolean network = FALSE;
key = SEAHORSE_KEY_WIDGET (swidget)->skey;
- git = SEAHORSE_GKEYRING_ITEM (key);
+ git = SEAHORSE_GKR_ITEM (key);
/* Image */
widget = seahorse_widget_get_widget (swidget, "key-image");
@@ -81,7 +81,7 @@
/* Description */
widget = seahorse_widget_get_widget (swidget, "description-field");
if (widget) {
- text = seahorse_gkeyring_item_get_description (git);
+ text = seahorse_gkr_item_get_description (git);
gtk_entry_set_text (GTK_ENTRY (widget), text ? text : "");
g_free (text);
}
@@ -93,22 +93,22 @@
g_free (text);
/* Use and type */
- switch (seahorse_gkeyring_item_get_use (git)) {
- case SEAHORSE_GKEYRING_USE_NETWORK:
+ switch (seahorse_gkr_item_get_use (git)) {
+ case SEAHORSE_GKR_USE_NETWORK:
label = _("Access a network share or resource");
network = TRUE;
break;
- case SEAHORSE_GKEYRING_USE_WEB:
+ case SEAHORSE_GKR_USE_WEB:
label = _("Access a website");
network = TRUE;
break;
- case SEAHORSE_GKEYRING_USE_PGP:
+ case SEAHORSE_GKR_USE_PGP:
label = _("Unlocks a PGP key");
break;
- case SEAHORSE_GKEYRING_USE_SSH:
+ case SEAHORSE_GKR_USE_SSH:
label = _("Unlocks a Secure Shell key");
break;
- case SEAHORSE_GKEYRING_USE_OTHER:
+ case SEAHORSE_GKR_USE_OTHER:
label = _("Saved password or login");
break;
default:
@@ -132,12 +132,12 @@
seahorse_widget_set_visible (swidget, "login-field", network);
if (network) {
- label = seahorse_gkeyring_item_get_attribute (git, "server");
+ label = seahorse_gkr_item_get_attribute (git, "server");
widget = seahorse_widget_get_widget (swidget, "server-field");
if (widget)
gtk_label_set_text (GTK_LABEL (widget), label);
- label = seahorse_gkeyring_item_get_attribute (git, "user");
+ label = seahorse_gkr_item_get_attribute (git, "user");
widget = seahorse_widget_get_widget (swidget, "login-field");
if (widget)
gtk_label_set_text (GTK_LABEL (widget), label);
@@ -150,14 +150,14 @@
password_activate (SeahorseSecureEntry *entry, SeahorseWidget *swidget)
{
SeahorseKey *key;
- SeahorseGKeyringItem *git;
+ SeahorseGkrItem *git;
SeahorseOperation *op;
GnomeKeyringItemInfo *info;
GtkWidget *widget;
GError *err = NULL;
key = SEAHORSE_KEY_WIDGET (swidget)->skey;
- git = SEAHORSE_GKEYRING_ITEM (key);
+ git = SEAHORSE_GKR_ITEM (key);
widget = seahorse_widget_get_widget (swidget, "password-expander");
g_return_if_fail (widget);
@@ -176,7 +176,7 @@
gtk_widget_set_sensitive (GTK_WIDGET (entry), FALSE);
- op = seahorse_gkeyring_operation_update_info (git, info);
+ op = seahorse_gkr_operation_update_info (git, info);
gnome_keyring_item_info_free (info);
/* This is usually a quick operation */
@@ -216,12 +216,12 @@
password_expander_activate (GtkExpander *expander, SeahorseWidget *swidget)
{
SeahorseKey *key;
- SeahorseGKeyringItem *git;
+ SeahorseGkrItem *git;
GtkWidget *widget;
GtkWidget *box;
key = SEAHORSE_KEY_WIDGET (swidget)->skey;
- git = SEAHORSE_GKEYRING_ITEM (key);
+ git = SEAHORSE_GKR_ITEM (key);
if (!gtk_expander_get_expanded (expander))
return;
@@ -260,7 +260,7 @@
description_activate (GtkWidget *entry, SeahorseWidget *swidget)
{
SeahorseKey *key;
- SeahorseGKeyringItem *git;
+ SeahorseGkrItem *git;
SeahorseOperation *op;
GnomeKeyringItemInfo *info;
const gchar *text;
@@ -268,10 +268,10 @@
GError *err = NULL;
key = SEAHORSE_KEY_WIDGET (swidget)->skey;
- git = SEAHORSE_GKEYRING_ITEM (key);
+ git = SEAHORSE_GKR_ITEM (key);
text = gtk_entry_get_text (GTK_ENTRY (entry));
- original = seahorse_gkeyring_item_get_description (git);
+ original = seahorse_gkr_item_get_description (git);
/* Make sure not the same */
if (text == original || g_utf8_collate (text, original ? original : "") == 0) {
@@ -284,7 +284,7 @@
WITH_SECURE_MEM (info = gnome_keyring_item_info_copy (git->info));
gnome_keyring_item_info_set_display_name (info, text);
- op = seahorse_gkeyring_operation_update_info (git, info);
+ op = seahorse_gkr_operation_update_info (git, info);
gnome_keyring_item_info_free (info);
/* This is usually a quick operation */
@@ -317,13 +317,13 @@
do_details (SeahorseWidget *swidget)
{
SeahorseKey *key;
- SeahorseGKeyringItem *git;
+ SeahorseGkrItem *git;
GString *details;
GtkWidget *widget;
guint i;
key = SEAHORSE_KEY_WIDGET (swidget)->skey;
- git = SEAHORSE_GKEYRING_ITEM (key);
+ git = SEAHORSE_GKR_ITEM (key);
details = g_string_new (NULL);
@@ -393,7 +393,7 @@
update_application_details (SeahorseWidget *swidget)
{
SeahorseKey *key;
- SeahorseGKeyringItem *git;
+ SeahorseGkrItem *git;
GnomeKeyringAccessControl *ac;
GtkLabel *label;
GtkToggleButton *toggle;
@@ -402,7 +402,7 @@
gchar *path;
key = SEAHORSE_KEY_WIDGET (swidget)->skey;
- git = SEAHORSE_GKEYRING_ITEM (key);
+ git = SEAHORSE_GKR_ITEM (key);
index = selected_application_index (swidget);
if (index < 0) {
@@ -462,7 +462,7 @@
application_access_toggled (GtkCheckButton *check, SeahorseWidget *swidget)
{
SeahorseKey *key;
- SeahorseGKeyringItem *git;
+ SeahorseGkrItem *git;
SeahorseOperation *op;
GnomeKeyringAccessType access;
GnomeKeyringAccessControl *ac;
@@ -475,7 +475,7 @@
return;
key = SEAHORSE_KEY_WIDGET (swidget)->skey;
- git = SEAHORSE_GKEYRING_ITEM (key);
+ git = SEAHORSE_GKR_ITEM (key);
index = selected_application_index (swidget);
g_return_if_fail (index >= 0);
@@ -496,7 +496,7 @@
seahorse_widget_set_sensitive (swidget, "application-details", FALSE);
- op = seahorse_gkeyring_operation_update_acl (git, acl);
+ op = seahorse_gkr_operation_update_acl (git, acl);
g_return_if_fail (op);
seahorse_operation_wait (op);
@@ -517,7 +517,7 @@
do_application (SeahorseWidget *swidget)
{
SeahorseKey *key;
- SeahorseGKeyringItem *git;
+ SeahorseGkrItem *git;
GtkTreeView *tree;
GtkListStore *store;
GtkTreeModel *model;
@@ -530,7 +530,7 @@
gchar *display;
key = SEAHORSE_KEY_WIDGET (swidget)->skey;
- git = SEAHORSE_GKEYRING_ITEM (key);
+ git = SEAHORSE_GKR_ITEM (key);
tree = GTK_TREE_VIEW (seahorse_widget_get_widget (swidget, "application-list"));
g_return_if_fail (tree);
@@ -614,14 +614,14 @@
}
void
-seahorse_gkeyring_item_properties_show (SeahorseGKeyringItem *git, GtkWindow *parent)
+seahorse_gkr_item_properties_show (SeahorseGkrItem *git, GtkWindow *parent)
{
SeahorseKey *key = SEAHORSE_KEY (git);
SeahorseSource *sksrc;
SeahorseWidget *swidget = NULL;
GtkWidget *widget;
- swidget = seahorse_key_widget_new ("gkeyring-item-properties",
+ swidget = seahorse_key_widget_new ("gkr-item-properties",
parent,
key);
Copied: trunk/gkr/seahorse-gkr-item-properties.glade (from r2629, /trunk/gkr/seahorse-gkeyring-item-properties.glade)
==============================================================================
--- /trunk/gkr/seahorse-gkeyring-item-properties.glade (original)
+++ trunk/gkr/seahorse-gkr-item-properties.glade Sun Nov 23 15:07:15 2008
@@ -3,7 +3,7 @@
<glade-interface>
-<widget class="GtkDialog" id="gkeyring-item-properties">
+<widget class="GtkDialog" id="gkr-item-properties">
<property name="border_width">5</property>
<property name="visible">True</property>
<property name="title" translatable="yes">Key Properties</property>
Copied: trunk/gkr/seahorse-gkr-item.c (from r2629, /trunk/gkr/seahorse-gkeyring-item.c)
==============================================================================
--- /trunk/gkr/seahorse-gkeyring-item.c (original)
+++ trunk/gkr/seahorse-gkr-item.c Sun Nov 23 15:07:15 2008
@@ -27,7 +27,7 @@
#include "seahorse-context.h"
#include "seahorse-source.h"
-#include "seahorse-gkeyring-item.h"
+#include "seahorse-gkr-item.h"
#include "seahorse-gtkstock.h"
#include "seahorse-util.h"
#include "seahorse-secure-memory.h"
@@ -62,7 +62,7 @@
PROP_STOCK_ID
};
-G_DEFINE_TYPE (SeahorseGKeyringItem, seahorse_gkeyring_item, SEAHORSE_TYPE_KEY);
+G_DEFINE_TYPE (SeahorseGkrItem, seahorse_gkr_item, SEAHORSE_TYPE_KEY);
/* -----------------------------------------------------------------------------
* INTERNAL HELPERS
@@ -88,7 +88,7 @@
static gboolean
-is_network_item (SeahorseGKeyringItem *git, const gchar *match)
+is_network_item (SeahorseGkrItem *git, const gchar *match)
{
const gchar *protocol;
if(gnome_keyring_item_info_get_type (git->info) != GNOME_KEYRING_ITEM_NETWORK_PASSWORD)
@@ -97,12 +97,12 @@
if (!match)
return TRUE;
- protocol = seahorse_gkeyring_item_get_attribute (git, "protocol");
+ protocol = seahorse_gkr_item_get_attribute (git, "protocol");
return protocol && g_ascii_strncasecmp (protocol, match, strlen (match)) == 0;
}
static gboolean
-is_custom_display_name (SeahorseGKeyringItem *git, const gchar *display)
+is_custom_display_name (SeahorseGkrItem *git, const gchar *display)
{
const gchar *user;
const gchar *server;
@@ -124,9 +124,9 @@
* customized display names and ignore the generated ones.
*/
- user = seahorse_gkeyring_item_get_attribute (git, "user");
- server = seahorse_gkeyring_item_get_attribute (git, "server");
- object = seahorse_gkeyring_item_get_attribute (git, "object");
+ user = seahorse_gkr_item_get_attribute (git, "user");
+ server = seahorse_gkr_item_get_attribute (git, "server");
+ object = seahorse_gkr_item_get_attribute (git, "object");
port = find_attribute_int (git->attributes, "port");
if (!server)
@@ -148,7 +148,7 @@
}
static gchar*
-calc_display_name (SeahorseGKeyringItem *git, gboolean always)
+calc_display_name (SeahorseGkrItem *git, gboolean always)
{
const gchar *val;
gchar *display;
@@ -164,7 +164,7 @@
/* HTTP usually has a the realm as the "object" display that */
if (is_network_item (git, "http") && git->attributes) {
- val = seahorse_gkeyring_item_get_attribute (git, "object");
+ val = seahorse_gkr_item_get_attribute (git, "object");
if (val && val[0]) {
g_free (display);
return g_strdup (val);
@@ -173,7 +173,7 @@
/* Display the server name as a last resort */
if (always) {
- val = seahorse_gkeyring_item_get_attribute (git, "server");
+ val = seahorse_gkr_item_get_attribute (git, "server");
if (val && val[0]) {
g_free (display);
return g_strdup (val);
@@ -185,7 +185,7 @@
}
static gchar*
-calc_network_item_markup (SeahorseGKeyringItem *git)
+calc_network_item_markup (SeahorseGkrItem *git)
{
const gchar *object;
const gchar *user;
@@ -196,10 +196,10 @@
gchar *display = NULL;
gchar *ret;
- server = seahorse_gkeyring_item_get_attribute (git, "server");
- protocol = seahorse_gkeyring_item_get_attribute (git, "protocol");
- object = seahorse_gkeyring_item_get_attribute (git, "object");
- user = seahorse_gkeyring_item_get_attribute (git, "user");
+ server = seahorse_gkr_item_get_attribute (git, "server");
+ protocol = seahorse_gkr_item_get_attribute (git, "protocol");
+ object = seahorse_gkr_item_get_attribute (git, "object");
+ user = seahorse_gkr_item_get_attribute (git, "user");
if (!protocol)
return NULL;
@@ -228,7 +228,7 @@
}
static void
-changed_key (SeahorseGKeyringItem *git)
+changed_key (SeahorseGkrItem *git)
{
SeahorseKey *skey = SEAHORSE_KEY (git);
SeahorseObject *obj = SEAHORSE_OBJECT (git);
@@ -254,7 +254,7 @@
obj->_location = SEAHORSE_LOCATION_LOCAL;
obj->_usage = SEAHORSE_USAGE_CREDENTIALS;
obj->_flags = 0;
- obj->_id = seahorse_gkeyring_item_get_cannonical (git->item_id);
+ obj->_id = seahorse_gkr_item_get_cannonical (git->item_id);
if (is_network_item (git, "http"))
skey->keydesc = _("Web Password");
@@ -271,31 +271,31 @@
*/
static void
-seahorse_gkeyring_item_init (SeahorseGKeyringItem *git)
+seahorse_gkr_item_init (SeahorseGkrItem *git)
{
}
static guint
-seahorse_gkeyring_item_get_num_names (SeahorseKey *git)
+seahorse_gkr_item_get_num_names (SeahorseKey *git)
{
/* Always one name */
return 1;
}
static gchar*
-seahorse_gkeyring_item_get_name (SeahorseKey *skey, guint index)
+seahorse_gkr_item_get_name (SeahorseKey *skey, guint index)
{
- SeahorseGKeyringItem *git = SEAHORSE_GKEYRING_ITEM (skey);
+ SeahorseGkrItem *git = SEAHORSE_GKR_ITEM (skey);
g_return_val_if_fail (index == 0, NULL);
return calc_display_name (git, TRUE);
}
static gchar*
-seahorse_gkeyring_item_get_name_markup (SeahorseKey *skey, guint index)
+seahorse_gkr_item_get_name_markup (SeahorseKey *skey, guint index)
{
- SeahorseGKeyringItem *git = SEAHORSE_GKEYRING_ITEM (skey);
+ SeahorseGkrItem *git = SEAHORSE_GKR_ITEM (skey);
gchar *t, *markup = NULL;
g_return_val_if_fail (index == 0, NULL);
@@ -315,24 +315,24 @@
}
static gchar*
-seahorse_gkeyring_item_get_name_cn (SeahorseKey *skey, guint index)
+seahorse_gkr_item_get_name_cn (SeahorseKey *skey, guint index)
{
g_return_val_if_fail (index == 0, NULL);
return NULL;
}
static SeahorseValidity
-seahorse_gkeyring_item_get_name_validity (SeahorseKey *skey, guint index)
+seahorse_gkr_item_get_name_validity (SeahorseKey *skey, guint index)
{
g_return_val_if_fail (index == 0, SEAHORSE_VALIDITY_UNKNOWN);
return SEAHORSE_VALIDITY_FULL;
}
static void
-seahorse_gkeyring_item_get_property (GObject *object, guint prop_id,
- GValue *value, GParamSpec *pspec)
+seahorse_gkr_item_get_property (GObject *object, guint prop_id,
+ GValue *value, GParamSpec *pspec)
{
- SeahorseGKeyringItem *git = SEAHORSE_GKEYRING_ITEM (object);
+ SeahorseGkrItem *git = SEAHORSE_GKR_ITEM (object);
SeahorseKey *skey = SEAHORSE_KEY (object);
switch (prop_id) {
@@ -349,13 +349,13 @@
g_value_set_pointer (value, git->acl);
break;
case PROP_DISPLAY_NAME:
- g_value_take_string (value, seahorse_gkeyring_item_get_name (skey, 0));
+ g_value_take_string (value, seahorse_gkr_item_get_name (skey, 0));
break;
case PROP_DISPLAY_ID:
g_value_set_string (value, seahorse_key_get_short_keyid (skey));
break;
case PROP_SIMPLE_NAME:
- g_value_take_string (value, seahorse_gkeyring_item_get_name (skey, 0));
+ g_value_take_string (value, seahorse_gkr_item_get_name (skey, 0));
break;
case PROP_FINGERPRINT:
g_value_set_string (value, seahorse_key_get_short_keyid (skey));
@@ -396,10 +396,10 @@
}
static void
-seahorse_gkeyring_item_set_property (GObject *object, guint prop_id, const GValue *value,
- GParamSpec *pspec)
+seahorse_gkr_item_set_property (GObject *object, guint prop_id, const GValue *value,
+ GParamSpec *pspec)
{
- SeahorseGKeyringItem *git = SEAHORSE_GKEYRING_ITEM (object);
+ SeahorseGkrItem *git = SEAHORSE_GKR_ITEM (object);
switch (prop_id) {
case PROP_ITEM_ID:
@@ -432,9 +432,9 @@
}
static void
-seahorse_gkeyring_item_object_finalize (GObject *gobject)
+seahorse_gkr_item_object_finalize (GObject *gobject)
{
- SeahorseGKeyringItem *git = SEAHORSE_GKEYRING_ITEM (gobject);
+ SeahorseGkrItem *git = SEAHORSE_GKR_ITEM (gobject);
if (git->info)
gnome_keyring_item_info_free (git->info);
@@ -447,29 +447,29 @@
gnome_keyring_acl_free (git->acl);
git->acl = NULL;
- G_OBJECT_CLASS (seahorse_gkeyring_item_parent_class)->finalize (gobject);
+ G_OBJECT_CLASS (seahorse_gkr_item_parent_class)->finalize (gobject);
}
static void
-seahorse_gkeyring_item_class_init (SeahorseGKeyringItemClass *klass)
+seahorse_gkr_item_class_init (SeahorseGkrItemClass *klass)
{
GObjectClass *gobject_class;
SeahorseKeyClass *key_class;
- seahorse_gkeyring_item_parent_class = g_type_class_peek_parent (klass);
+ seahorse_gkr_item_parent_class = g_type_class_peek_parent (klass);
gobject_class = G_OBJECT_CLASS (klass);
- gobject_class->finalize = seahorse_gkeyring_item_object_finalize;
- gobject_class->set_property = seahorse_gkeyring_item_set_property;
- gobject_class->get_property = seahorse_gkeyring_item_get_property;
+ gobject_class->finalize = seahorse_gkr_item_object_finalize;
+ gobject_class->set_property = seahorse_gkr_item_set_property;
+ gobject_class->get_property = seahorse_gkr_item_get_property;
key_class = SEAHORSE_KEY_CLASS (klass);
- key_class->get_num_names = seahorse_gkeyring_item_get_num_names;
- key_class->get_name = seahorse_gkeyring_item_get_name;
- key_class->get_name_markup = seahorse_gkeyring_item_get_name_markup;
- key_class->get_name_cn = seahorse_gkeyring_item_get_name_cn;
- key_class->get_name_validity = seahorse_gkeyring_item_get_name_validity;
+ key_class->get_num_names = seahorse_gkr_item_get_num_names;
+ key_class->get_name = seahorse_gkr_item_get_name;
+ key_class->get_name_markup = seahorse_gkr_item_get_name_markup;
+ key_class->get_name_cn = seahorse_gkr_item_get_name_cn;
+ key_class->get_name_validity = seahorse_gkr_item_get_name_validity;
g_object_class_install_property (gobject_class, PROP_ITEM_ID,
g_param_spec_uint ("item-id", "Item ID", "GNOME Keyring Item ID",
@@ -529,26 +529,25 @@
* PUBLIC
*/
-SeahorseGKeyringItem*
-seahorse_gkeyring_item_new (SeahorseSource *sksrc, guint32 item_id,
- GnomeKeyringItemInfo *info, GnomeKeyringAttributeList *attributes,
- GList *acl)
+SeahorseGkrItem*
+seahorse_gkr_item_new (SeahorseSource *sksrc, guint32 item_id, GnomeKeyringItemInfo *info,
+ GnomeKeyringAttributeList *attributes, GList *acl)
{
- SeahorseGKeyringItem *git;
- git = g_object_new (SEAHORSE_TYPE_GKEYRING_ITEM, "key-source", sksrc,
+ SeahorseGkrItem *git;
+ git = g_object_new (SEAHORSE_TYPE_GKR_ITEM, "key-source", sksrc,
"item-id", item_id, "item-info", info,
"item-attributes", attributes, "item-acl", acl, NULL);
return git;
}
gchar*
-seahorse_gkeyring_item_get_description (SeahorseGKeyringItem *git)
+seahorse_gkr_item_get_description (SeahorseGkrItem *git)
{
return calc_display_name (git, FALSE);
}
const gchar*
-seahorse_gkeyring_item_get_attribute (SeahorseGKeyringItem *git, const gchar *name)
+seahorse_gkr_item_get_attribute (SeahorseGkrItem *git, const gchar *name)
{
guint i;
@@ -565,37 +564,37 @@
return NULL;
}
-SeahorseGKeyringUse
-seahorse_gkeyring_item_get_use (SeahorseGKeyringItem *git)
+SeahorseGkrUse
+seahorse_gkr_item_get_use (SeahorseGkrItem *git)
{
const gchar *val;
/* Network passwords */
if (gnome_keyring_item_info_get_type (git->info) == GNOME_KEYRING_ITEM_NETWORK_PASSWORD) {
if (is_network_item (git, "http"))
- return SEAHORSE_GKEYRING_USE_WEB;
- return SEAHORSE_GKEYRING_USE_NETWORK;
+ return SEAHORSE_GKR_USE_WEB;
+ return SEAHORSE_GKR_USE_NETWORK;
}
if (git->attributes) {
- val = seahorse_gkeyring_item_get_attribute (git, "seahorse-key-type");
+ val = seahorse_gkr_item_get_attribute (git, "seahorse-key-type");
if (val) {
#ifdef WITH_PGP
if (strcmp (val, SEAHORSE_PGP_STR) == 0)
- return SEAHORSE_GKEYRING_USE_PGP;
+ return SEAHORSE_GKR_USE_PGP;
#endif
#ifdef WITH_SSH
if (strcmp (val, SEAHORSE_SSH_STR) == 0)
- return SEAHORSE_GKEYRING_USE_SSH;
+ return SEAHORSE_GKR_USE_SSH;
#endif
}
}
- return SEAHORSE_GKEYRING_USE_OTHER;
+ return SEAHORSE_GKR_USE_OTHER;
}
GQuark
-seahorse_gkeyring_item_get_cannonical (guint32 item_id)
+seahorse_gkr_item_get_cannonical (guint32 item_id)
{
#define BUF_LEN (G_N_ELEMENTS (SEAHORSE_GKR_STR) + 16)
gchar buf[BUF_LEN];
Copied: trunk/gkr/seahorse-gkr-item.h (from r2629, /trunk/gkr/seahorse-gkeyring-item.h)
==============================================================================
--- /trunk/gkr/seahorse-gkeyring-item.h (original)
+++ trunk/gkr/seahorse-gkr-item.h Sun Nov 23 15:07:15 2008
@@ -36,8 +36,8 @@
* stock-id: (string) The stock icon id.
*/
-#ifndef __SEAHORSE_GKEYRING_ITEM_H__
-#define __SEAHORSE_GKEYRING_ITEM_H__
+#ifndef __SEAHORSE_GKR_ITEM_H__
+#define __SEAHORSE_GKR_ITEM_H__
#include <gtk/gtk.h>
#include <gnome-keyring.h>
@@ -48,26 +48,26 @@
#include "seahorse-source.h"
typedef enum {
- SEAHORSE_GKEYRING_USE_OTHER,
- SEAHORSE_GKEYRING_USE_NETWORK,
- SEAHORSE_GKEYRING_USE_WEB,
- SEAHORSE_GKEYRING_USE_PGP,
- SEAHORSE_GKEYRING_USE_SSH,
-} SeahorseGKeyringUse;
-
-#define SEAHORSE_TYPE_GKEYRING_ITEM (seahorse_gkeyring_item_get_type ())
-#define SEAHORSE_GKEYRING_TYPE_ITEM SEAHORSE_TYPE_GKEYRING_ITEM
-#define SEAHORSE_GKEYRING_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_GKEYRING_ITEM, SeahorseGKeyringItem))
-#define SEAHORSE_GKEYRING_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_GKEYRING_ITEM, SeahorseGKeyringItemClass))
-#define SEAHORSE_IS_GKEYRING_ITEM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_GKEYRING_ITEM))
-#define SEAHORSE_IS_GKEYRING_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_GKEYRING_ITEM))
-#define SEAHORSE_GKEYRING_ITEM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_GKEYRING_ITEM_KEY, SeahorseGKeyringItemClass))
+ SEAHORSE_GKR_USE_OTHER,
+ SEAHORSE_GKR_USE_NETWORK,
+ SEAHORSE_GKR_USE_WEB,
+ SEAHORSE_GKR_USE_PGP,
+ SEAHORSE_GKR_USE_SSH,
+} SeahorseGkrUse;
+
+#define SEAHORSE_TYPE_GKR_ITEM (seahorse_gkr_item_get_type ())
+#define SEAHORSE_GKR_TYPE_ITEM SEAHORSE_TYPE_GKR_ITEM
+#define SEAHORSE_GKR_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_GKR_ITEM, SeahorseGkrItem))
+#define SEAHORSE_GKR_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_GKR_ITEM, SeahorseGkrItemClass))
+#define SEAHORSE_IS_GKR_ITEM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_GKR_ITEM))
+#define SEAHORSE_IS_GKR_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_GKR_ITEM))
+#define SEAHORSE_GKR_ITEM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_GKR_ITEM_KEY, SeahorseGkrItemClass))
-typedef struct _SeahorseGKeyringItem SeahorseGKeyringItem;
-typedef struct _SeahorseGKeyringItemClass SeahorseGKeyringItemClass;
+typedef struct _SeahorseGkrItem SeahorseGkrItem;
+typedef struct _SeahorseGkrItemClass SeahorseGkrItemClass;
-struct _SeahorseGKeyringItem {
+struct _SeahorseGkrItem {
SeahorseKey parent;
/*< public >*/
@@ -77,26 +77,25 @@
GList *acl;
};
-struct _SeahorseGKeyringItemClass {
+struct _SeahorseGkrItemClass {
SeahorseKeyClass parent_class;
};
-// TODO: arguments specific to GKeyring Item
-SeahorseGKeyringItem* seahorse_gkeyring_item_new (SeahorseSource *sksrc,
- guint32 item_id,
- GnomeKeyringItemInfo *info,
- GnomeKeyringAttributeList *attributes,
- GList *acl);
+SeahorseGkrItem* seahorse_gkr_item_new (SeahorseSource *sksrc,
+ guint32 item_id,
+ GnomeKeyringItemInfo *info,
+ GnomeKeyringAttributeList *attributes,
+ GList *acl);
-GType seahorse_gkeyring_item_get_type (void);
+GType seahorse_gkr_item_get_type (void);
-GQuark seahorse_gkeyring_item_get_cannonical (guint32 item_id);
+GQuark seahorse_gkr_item_get_cannonical (guint32 item_id);
-gchar* seahorse_gkeyring_item_get_description (SeahorseGKeyringItem *git);
+gchar* seahorse_gkr_item_get_description (SeahorseGkrItem *git);
-const gchar* seahorse_gkeyring_item_get_attribute (SeahorseGKeyringItem *git,
- const gchar *name);
+const gchar* seahorse_gkr_item_get_attribute (SeahorseGkrItem *git,
+ const gchar *name);
-SeahorseGKeyringUse seahorse_gkeyring_item_get_use (SeahorseGKeyringItem *git);
+SeahorseGkrUse seahorse_gkr_item_get_use (SeahorseGkrItem *git);
-#endif /* __SEAHORSE_GKEYRING_ITEM_H__ */
+#endif /* __SEAHORSE_GKR_ITEM_H__ */
Modified: trunk/gkr/seahorse-gkr-module.c
==============================================================================
--- trunk/gkr/seahorse-gkr-module.c (original)
+++ trunk/gkr/seahorse-gkr-module.c Sun Nov 23 15:07:15 2008
@@ -24,7 +24,7 @@
#include "seahorse-gkr-module.h"
#include "seahorse-gkr-commands.h"
-#include "seahorse-gkeyring-source.h"
+#include "seahorse-gkr-source.h"
#include "seahorse-context.h"
@@ -34,10 +34,10 @@
SeahorseSource *source;
/* Always have a default keyring source added */
- source = g_object_new (SEAHORSE_TYPE_GKEYRING_SOURCE, NULL);
+ source = g_object_new (SEAHORSE_TYPE_GKR_SOURCE, NULL);
seahorse_context_take_source (NULL, source);
/* Let these classes register themselves */
- g_type_class_unref (g_type_class_ref (SEAHORSE_TYPE_GKEYRING_SOURCE));
- g_type_class_unref (g_type_class_ref (SEAHORSE_GKEYRING_TYPE_COMMANDS));
+ g_type_class_unref (g_type_class_ref (SEAHORSE_TYPE_GKR_SOURCE));
+ g_type_class_unref (g_type_class_ref (SEAHORSE_TYPE_GKR_COMMANDS));
}
Copied: trunk/gkr/seahorse-gkr-operation.c (from r2629, /trunk/gkr/seahorse-gkeyring-operation.c)
==============================================================================
--- /trunk/gkr/seahorse-gkeyring-operation.c (original)
+++ trunk/gkr/seahorse-gkr-operation.c Sun Nov 23 15:07:15 2008
@@ -27,7 +27,7 @@
#include <glib/gi18n.h>
-#include "seahorse-gkeyring-operation.h"
+#include "seahorse-gkr-operation.h"
#include "seahorse-util.h"
#include "seahorse-passphrase.h"
@@ -51,29 +51,29 @@
* DEFINITIONS
*/
-typedef struct _SeahorseGKeyringOperationPrivate {
+typedef struct _SeahorseGkrOperationPrivate {
gpointer request;
GQuark keyid;
-} SeahorseGKeyringOperationPrivate;
+} SeahorseGkrOperationPrivate;
enum {
PROP_0,
PROP_KEY_SOURCE
};
-#define SEAHORSE_GKEYRING_OPERATION_GET_PRIVATE(obj) \
- (G_TYPE_INSTANCE_GET_PRIVATE ((obj), SEAHORSE_TYPE_GKEYRING_OPERATION, SeahorseGKeyringOperationPrivate))
+#define SEAHORSE_GKR_OPERATION_GET_PRIVATE(obj) \
+ (G_TYPE_INSTANCE_GET_PRIVATE ((obj), SEAHORSE_TYPE_GKR_OPERATION, SeahorseGkrOperationPrivate))
/* TODO: This is just nasty. Gotta get rid of these weird macros */
-IMPLEMENT_OPERATION_PROPS(GKeyring, gkeyring)
+IMPLEMENT_OPERATION_PROPS(Gkr, gkr)
g_object_class_install_property (gobject_class, PROP_KEY_SOURCE,
- g_param_spec_object ("key-source", "GKeyring Source", "Key source this operation works on.",
- SEAHORSE_TYPE_GKEYRING_SOURCE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY ));
+ g_param_spec_object ("key-source", "Gkr Source", "Key source this operation works on.",
+ SEAHORSE_TYPE_GKR_SOURCE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY ));
- g_type_class_add_private (gobject_class, sizeof (SeahorseGKeyringOperationPrivate));
+ g_type_class_add_private (gobject_class, sizeof (SeahorseGkrOperationPrivate));
END_IMPLEMENT_OPERATION_PROPS
@@ -82,7 +82,7 @@
*/
static gboolean
-check_operation_result (SeahorseGKeyringOperation *gop, GnomeKeyringResult result)
+check_operation_result (SeahorseGkrOperation *gop, GnomeKeyringResult result)
{
GError *err = NULL;
gboolean success;
@@ -91,7 +91,7 @@
if (result == GNOME_KEYRING_RESULT_CANCELLED)
return FALSE;
- success = seahorse_gkeyring_operation_parse_error (result, &err);
+ success = seahorse_gkr_operation_parse_error (result, &err);
g_assert (!success || !err);
seahorse_operation_mark_done (SEAHORSE_OPERATION (gop), FALSE, err);
@@ -103,32 +103,32 @@
*/
static void
-seahorse_gkeyring_operation_init (SeahorseGKeyringOperation *sop)
+seahorse_gkr_operation_init (SeahorseGkrOperation *sop)
{
}
static void
-seahorse_gkeyring_operation_set_property (GObject *gobject, guint prop_id,
+seahorse_gkr_operation_set_property (GObject *gobject, guint prop_id,
const GValue *value, GParamSpec *pspec)
{
- SeahorseGKeyringOperation *gop = SEAHORSE_GKEYRING_OPERATION (gobject);
+ SeahorseGkrOperation *gop = SEAHORSE_GKR_OPERATION (gobject);
switch (prop_id) {
case PROP_KEY_SOURCE:
if (gop->gsrc)
g_object_unref (gop->gsrc);
- gop->gsrc = SEAHORSE_GKEYRING_SOURCE (g_object_ref (g_value_get_object (value)));
+ gop->gsrc = SEAHORSE_GKR_SOURCE (g_object_ref (g_value_get_object (value)));
break;
}
}
static void
-seahorse_gkeyring_operation_get_property (GObject *gobject, guint prop_id,
- GValue *value, GParamSpec *pspec)
+seahorse_gkr_operation_get_property (GObject *gobject, guint prop_id,
+ GValue *value, GParamSpec *pspec)
{
- SeahorseGKeyringOperation *gop = SEAHORSE_GKEYRING_OPERATION (gobject);
+ SeahorseGkrOperation *gop = SEAHORSE_GKR_OPERATION (gobject);
switch (prop_id) {
case PROP_KEY_SOURCE:
@@ -138,13 +138,13 @@
}
static void
-seahorse_gkeyring_operation_dispose (GObject *gobject)
+seahorse_gkr_operation_dispose (GObject *gobject)
{
- SeahorseGKeyringOperation *gop = SEAHORSE_GKEYRING_OPERATION (gobject);
- SeahorseGKeyringOperationPrivate *pv = SEAHORSE_GKEYRING_OPERATION_GET_PRIVATE (gop);
+ SeahorseGkrOperation *gop = SEAHORSE_GKR_OPERATION (gobject);
+ SeahorseGkrOperationPrivate *pv = SEAHORSE_GKR_OPERATION_GET_PRIVATE (gop);
if (seahorse_operation_is_running (SEAHORSE_OPERATION (gop)))
- seahorse_gkeyring_operation_cancel (SEAHORSE_OPERATION (gop));
+ seahorse_gkr_operation_cancel (SEAHORSE_OPERATION (gop));
g_assert (!seahorse_operation_is_running (SEAHORSE_OPERATION (gop)));
if (gop->gsrc)
@@ -154,26 +154,26 @@
/* The above cancel should have stopped this */
g_assert (pv->request == NULL);
- G_OBJECT_CLASS (gkeyring_operation_parent_class)->dispose (gobject);
+ G_OBJECT_CLASS (gkr_operation_parent_class)->dispose (gobject);
}
static void
-seahorse_gkeyring_operation_finalize (GObject *gobject)
+seahorse_gkr_operation_finalize (GObject *gobject)
{
- SeahorseGKeyringOperation *gop = SEAHORSE_GKEYRING_OPERATION (gobject);
- SeahorseGKeyringOperationPrivate *pv = SEAHORSE_GKEYRING_OPERATION_GET_PRIVATE (gop);
+ SeahorseGkrOperation *gop = SEAHORSE_GKR_OPERATION (gobject);
+ SeahorseGkrOperationPrivate *pv = SEAHORSE_GKR_OPERATION_GET_PRIVATE (gop);
g_assert (!gop->gsrc);
g_assert (!pv->request);
- G_OBJECT_CLASS (gkeyring_operation_parent_class)->finalize (gobject);
+ G_OBJECT_CLASS (gkr_operation_parent_class)->finalize (gobject);
}
static void
-seahorse_gkeyring_operation_cancel (SeahorseOperation *operation)
+seahorse_gkr_operation_cancel (SeahorseOperation *operation)
{
- SeahorseGKeyringOperation *sop = SEAHORSE_GKEYRING_OPERATION (operation);
- SeahorseGKeyringOperationPrivate *pv = SEAHORSE_GKEYRING_OPERATION_GET_PRIVATE (sop);
+ SeahorseGkrOperation *sop = SEAHORSE_GKR_OPERATION (operation);
+ SeahorseGkrOperationPrivate *pv = SEAHORSE_GKR_OPERATION_GET_PRIVATE (sop);
if (pv->request)
gnome_keyring_cancel_request (pv->request);
@@ -188,7 +188,7 @@
*/
gboolean
-seahorse_gkeyring_operation_parse_error (GnomeKeyringResult result, GError **err)
+seahorse_gkr_operation_parse_error (GnomeKeyringResult result, GError **err)
{
static GQuark errorq = 0;
const gchar *message = NULL;
@@ -239,14 +239,14 @@
*/
static void
-basic_operation_done (GnomeKeyringResult result, SeahorseGKeyringOperation *gop)
+basic_operation_done (GnomeKeyringResult result, SeahorseGkrOperation *gop)
{
- SeahorseGKeyringOperationPrivate *pv;
+ SeahorseGkrOperationPrivate *pv;
if (!check_operation_result (gop, result))
return;
- pv = SEAHORSE_GKEYRING_OPERATION_GET_PRIVATE (gop);
+ pv = SEAHORSE_GKR_OPERATION_GET_PRIVATE (gop);
/* When operation is successful reload the key */
g_return_if_fail (pv->keyid != 0);
@@ -254,23 +254,23 @@
}
SeahorseOperation*
-seahorse_gkeyring_operation_update_info (SeahorseGKeyringItem *git, GnomeKeyringItemInfo *info)
+seahorse_gkr_operation_update_info (SeahorseGkrItem *git, GnomeKeyringItemInfo *info)
{
SeahorseSource *sksrc;
- SeahorseGKeyringOperation *gop;
- SeahorseGKeyringOperationPrivate *pv;
+ SeahorseGkrOperation *gop;
+ SeahorseGkrOperationPrivate *pv;
const gchar *keyring_name;
- g_return_val_if_fail (SEAHORSE_IS_GKEYRING_ITEM (git), NULL);
+ g_return_val_if_fail (SEAHORSE_IS_GKR_ITEM (git), NULL);
sksrc = seahorse_key_get_source (SEAHORSE_KEY (git));
- g_return_val_if_fail (SEAHORSE_IS_GKEYRING_SOURCE (sksrc), NULL);
+ g_return_val_if_fail (SEAHORSE_IS_GKR_SOURCE (sksrc), NULL);
- gop = g_object_new (SEAHORSE_TYPE_GKEYRING_OPERATION,
- "key-source", SEAHORSE_GKEYRING_SOURCE (sksrc), NULL);
- pv = SEAHORSE_GKEYRING_OPERATION_GET_PRIVATE (gop);
+ gop = g_object_new (SEAHORSE_TYPE_GKR_OPERATION,
+ "key-source", SEAHORSE_GKR_SOURCE (sksrc), NULL);
+ pv = SEAHORSE_GKR_OPERATION_GET_PRIVATE (gop);
- keyring_name = seahorse_gkeyring_source_get_keyring_name (SEAHORSE_GKEYRING_SOURCE (sksrc));
+ keyring_name = seahorse_gkr_source_get_keyring_name (SEAHORSE_GKR_SOURCE (sksrc));
pv->keyid = seahorse_key_get_keyid (SEAHORSE_KEY (git));
/* Start actual save request */
@@ -286,23 +286,23 @@
}
SeahorseOperation*
-seahorse_gkeyring_operation_update_acl (SeahorseGKeyringItem *git, GList *acl)
+seahorse_gkr_operation_update_acl (SeahorseGkrItem *git, GList *acl)
{
SeahorseSource *sksrc;
- SeahorseGKeyringOperation *gop;
- SeahorseGKeyringOperationPrivate *pv;
+ SeahorseGkrOperation *gop;
+ SeahorseGkrOperationPrivate *pv;
const gchar *keyring_name;
- g_return_val_if_fail (SEAHORSE_IS_GKEYRING_ITEM (git), NULL);
+ g_return_val_if_fail (SEAHORSE_IS_GKR_ITEM (git), NULL);
sksrc = seahorse_key_get_source (SEAHORSE_KEY (git));
- g_return_val_if_fail (SEAHORSE_IS_GKEYRING_SOURCE (sksrc), NULL);
+ g_return_val_if_fail (SEAHORSE_IS_GKR_SOURCE (sksrc), NULL);
- gop = g_object_new (SEAHORSE_TYPE_GKEYRING_OPERATION,
- "key-source", SEAHORSE_GKEYRING_SOURCE (sksrc), NULL);
- pv = SEAHORSE_GKEYRING_OPERATION_GET_PRIVATE (gop);
+ gop = g_object_new (SEAHORSE_TYPE_GKR_OPERATION,
+ "key-source", SEAHORSE_GKR_SOURCE (sksrc), NULL);
+ pv = SEAHORSE_GKR_OPERATION_GET_PRIVATE (gop);
- keyring_name = seahorse_gkeyring_source_get_keyring_name (SEAHORSE_GKEYRING_SOURCE (sksrc));
+ keyring_name = seahorse_gkr_source_get_keyring_name (SEAHORSE_GKR_SOURCE (sksrc));
pv->keyid = seahorse_key_get_keyid (SEAHORSE_KEY (git));
/* Start actual save request */
Copied: trunk/gkr/seahorse-gkr-operation.h (from r2629, /trunk/gkr/seahorse-gkeyring-operation.h)
==============================================================================
--- /trunk/gkr/seahorse-gkeyring-operation.h (original)
+++ trunk/gkr/seahorse-gkr-operation.h Sun Nov 23 15:07:15 2008
@@ -20,7 +20,7 @@
*/
/**
- * SeahorseGKeyringOperation: Operations to be done on gnome-keyring items
+ * SeahorseGkrOperation: Operations to be done on gnome-keyring items
*
* - Derived from SeahorseOperation
*
@@ -28,36 +28,36 @@
* TODO:
*/
-#ifndef __SEAHORSE_GKEYRING_OPERATION_H__
-#define __SEAHORSE_GKEYRING_OPERATION_H__
+#ifndef __SEAHORSE_GKR_OPERATION_H__
+#define __SEAHORSE_GKR_OPERATION_H__
#include "seahorse-operation.h"
-#include "seahorse-gkeyring-source.h"
-#include "seahorse-gkeyring-item.h"
+#include "seahorse-gkr-source.h"
+#include "seahorse-gkr-item.h"
-#define SEAHORSE_TYPE_GKEYRING_OPERATION (seahorse_gkeyring_operation_get_type ())
-#define SEAHORSE_GKEYRING_OPERATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_GKEYRING_OPERATION, SeahorseGKeyringOperation))
-#define SEAHORSE_GKEYRING_OPERATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_GKEYRING_OPERATION, SeahorseGKeyringOperationClass))
-#define SEAHORSE_IS_GKEYRING_OPERATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_GKEYRING_OPERATION))
-#define SEAHORSE_IS_GKEYRING_OPERATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_GKEYRING_OPERATION))
-#define SEAHORSE_GKEYRING_OPERATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_GKEYRING_OPERATION, SeahorseGKeyringOperationClass))
+#define SEAHORSE_TYPE_GKR_OPERATION (seahorse_gkr_operation_get_type ())
+#define SEAHORSE_GKR_OPERATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_GKR_OPERATION, SeahorseGkrOperation))
+#define SEAHORSE_GKR_OPERATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_GKR_OPERATION, SeahorseGkrOperationClass))
+#define SEAHORSE_IS_GKR_OPERATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_GKR_OPERATION))
+#define SEAHORSE_IS_GKR_OPERATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_GKR_OPERATION))
+#define SEAHORSE_GKR_OPERATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_GKR_OPERATION, SeahorseGkrOperationClass))
-DECLARE_OPERATION (GKeyring, gkeyring)
+DECLARE_OPERATION (Gkr, gkr)
/*< public >*/
- SeahorseGKeyringSource *gsrc;
+ SeahorseGkrSource *gsrc;
END_DECLARE_OPERATION
-gboolean seahorse_gkeyring_operation_parse_error (GnomeKeyringResult result,
- GError **err);
+gboolean seahorse_gkr_operation_parse_error (GnomeKeyringResult result,
+ GError **err);
/* result: nothing */
-SeahorseOperation* seahorse_gkeyring_operation_update_info (SeahorseGKeyringItem *git,
- GnomeKeyringItemInfo *info);
+SeahorseOperation* seahorse_gkr_operation_update_info (SeahorseGkrItem *git,
+ GnomeKeyringItemInfo *info);
/* result: nothing */
-SeahorseOperation* seahorse_gkeyring_operation_update_acl (SeahorseGKeyringItem *git,
- GList *acl);
+SeahorseOperation* seahorse_gkr_operation_update_acl (SeahorseGkrItem *git,
+ GList *acl);
-#endif /* __SEAHORSE_GKEYRING_OPERATION_H__ */
+#endif /* __SEAHORSE_GKR_OPERATION_H__ */
Copied: trunk/gkr/seahorse-gkr-source.c (from r2629, /trunk/gkr/seahorse-gkeyring-source.c)
==============================================================================
--- /trunk/gkr/seahorse-gkeyring-source.c (original)
+++ trunk/gkr/seahorse-gkr-source.c Sun Nov 23 15:07:15 2008
@@ -27,13 +27,13 @@
#include <glib/gi18n.h>
-#include "seahorse-gkeyring-source.h"
+#include "seahorse-gkr-source.h"
#include "seahorse-operation.h"
#include "seahorse-util.h"
-#include "seahorse-gkeyring-item.h"
+#include "seahorse-gkr-item.h"
#include "seahorse-secure-memory.h"
#include "seahorse-passphrase.h"
-#include "seahorse-gkeyring-operation.h"
+#include "seahorse-gkr-operation.h"
#include "common/seahorse-registry.h"
@@ -65,12 +65,12 @@
PROP_LOCATION
};
-struct _SeahorseGKeyringSourcePrivate {
+struct _SeahorseGkrSourcePrivate {
SeahorseMultiOperation *operations; /* A list of all current operations */
gchar *keyring_name; /* The key ring name */
};
-G_DEFINE_TYPE (SeahorseGKeyringSource, seahorse_gkeyring_source, SEAHORSE_TYPE_SOURCE);
+G_DEFINE_TYPE (SeahorseGkrSource, seahorse_gkr_source, SEAHORSE_TYPE_SOURCE);
/* Forward decls */
@@ -99,7 +99,7 @@
DECLARE_OPERATION (List, list)
- SeahorseGKeyringSource *gsrc;
+ SeahorseGkrSource *gsrc;
GList *remaining;
guint total;
@@ -170,7 +170,7 @@
gnome_keyring_cancel_request (lop->request_acl);
lop->request_acl = NULL;
- seahorse_gkeyring_operation_parse_error (result, &err);
+ seahorse_gkr_operation_parse_error (result, &err);
g_assert (err != NULL);
seahorse_operation_mark_done (op, FALSE, err);
@@ -179,8 +179,8 @@
static gboolean
have_complete_item (SeahorseListOperation *lop)
{
- SeahorseGKeyringItem *git = NULL;
- SeahorseGKeyringItem *prev;
+ SeahorseGkrItem *git = NULL;
+ SeahorseGkrItem *prev;
GQuark keyid;
g_assert (lop->current_id);
@@ -190,15 +190,15 @@
g_assert (lop->current_info);
- keyid = seahorse_gkeyring_item_get_cannonical (lop->current_id);
+ keyid = seahorse_gkr_item_get_cannonical (lop->current_id);
g_return_val_if_fail (keyid, FALSE);
/* Mark this key as seen */
if (lop->checks)
g_hash_table_remove (lop->checks, GUINT_TO_POINTER (keyid));
- g_assert (SEAHORSE_IS_GKEYRING_SOURCE (lop->gsrc));
- prev = SEAHORSE_GKEYRING_ITEM (seahorse_context_get_object (SCTX_APP (),
+ g_assert (SEAHORSE_IS_GKR_SOURCE (lop->gsrc));
+ prev = SEAHORSE_GKR_ITEM (seahorse_context_get_object (SCTX_APP (),
SEAHORSE_SOURCE (lop->gsrc), keyid));
/* Check if we can just replace the key on the object */
@@ -214,7 +214,7 @@
return TRUE;
}
- git = seahorse_gkeyring_item_new (SEAHORSE_SOURCE (lop->gsrc), lop->current_id,
+ git = seahorse_gkr_item_new (SEAHORSE_SOURCE (lop->gsrc), lop->current_id,
lop->current_info, lop->current_attrs, lop->current_acl);
/* We listen in to get notified of changes on this key */
@@ -318,7 +318,7 @@
process_next_item (SeahorseListOperation *lop)
{
g_assert (lop);
- g_assert (SEAHORSE_IS_GKEYRING_SOURCE (lop->gsrc));
+ g_assert (SEAHORSE_IS_GKR_SOURCE (lop->gsrc));
seahorse_operation_mark_progress_full (SEAHORSE_OPERATION (lop), NULL,
lop->total - g_list_length (lop->remaining),
@@ -381,12 +381,12 @@
}
static SeahorseListOperation*
-start_list_operation (SeahorseGKeyringSource *gsrc, GQuark keyid)
+start_list_operation (SeahorseGkrSource *gsrc, GQuark keyid)
{
SeahorseListOperation *lop;
GList *keys, *l;
- g_assert (SEAHORSE_IS_GKEYRING_SOURCE (gsrc));
+ g_assert (SEAHORSE_IS_GKR_SOURCE (gsrc));
lop = g_object_new (SEAHORSE_TYPE_LIST_OPERATION, NULL);
lop->gsrc = gsrc;
@@ -505,8 +505,8 @@
DECLARE_OPERATION (Remove, remove)
- SeahorseGKeyringSource *gsrc;
- SeahorseGKeyringItem *gitem;
+ SeahorseGkrSource *gsrc;
+ SeahorseGkrItem *gitem;
gpointer request;
END_DECLARE_OPERATION
@@ -524,7 +524,7 @@
if (result != GNOME_KEYRING_RESULT_OK) {
if (seahorse_operation_is_running (SEAHORSE_OPERATION (rop))) {
- seahorse_gkeyring_operation_parse_error (result, &err);
+ seahorse_gkr_operation_parse_error (result, &err);
g_assert (err != NULL);
seahorse_operation_mark_done (SEAHORSE_OPERATION (rop), FALSE, err);
}
@@ -536,12 +536,12 @@
}
static SeahorseRemoveOperation*
-start_remove_operation (SeahorseGKeyringSource *gsrc, SeahorseGKeyringItem *gitem)
+start_remove_operation (SeahorseGkrSource *gsrc, SeahorseGkrItem *gitem)
{
SeahorseRemoveOperation *rop;
- g_assert (SEAHORSE_IS_GKEYRING_SOURCE (gsrc));
- g_assert (SEAHORSE_IS_GKEYRING_ITEM (gitem));
+ g_assert (SEAHORSE_IS_GKR_SOURCE (gsrc));
+ g_assert (SEAHORSE_IS_GKR_ITEM (gitem));
rop = g_object_new (SEAHORSE_TYPE_REMOVE_OPERATION, NULL);
rop->gsrc = gsrc;
@@ -646,25 +646,25 @@
*/
static void
-seahorse_gkeyring_source_init (SeahorseGKeyringSource *gsrc)
+seahorse_gkr_source_init (SeahorseGkrSource *gsrc)
{
/* init private vars */
- gsrc->pv = g_new0 (SeahorseGKeyringSourcePrivate, 1);
+ gsrc->pv = g_new0 (SeahorseGkrSourcePrivate, 1);
gsrc->pv->operations = seahorse_multi_operation_new ();
}
static GObject*
-seahorse_gkeyring_source_constructor (GType type, guint n_props, GObjectConstructParam* props)
+seahorse_gkr_source_constructor (GType type, guint n_props, GObjectConstructParam* props)
{
- GObject* obj = G_OBJECT_CLASS (seahorse_gkeyring_source_parent_class)->constructor (type, n_props, props);
+ GObject* obj = G_OBJECT_CLASS (seahorse_gkr_source_parent_class)->constructor (type, n_props, props);
return obj;
}
static void
-seahorse_gkeyring_source_get_property (GObject *object, guint prop_id, GValue *value,
+seahorse_gkr_source_get_property (GObject *object, guint prop_id, GValue *value,
GParamSpec *pspec)
{
- SeahorseGKeyringSource *gsrc = SEAHORSE_GKEYRING_SOURCE (object);
+ SeahorseGkrSource *gsrc = SEAHORSE_GKR_SOURCE (object);
switch (prop_id) {
case PROP_KEYRING_NAME:
@@ -686,10 +686,10 @@
}
static void
-seahorse_gkeyring_source_set_property (GObject *object, guint prop_id, const GValue *value,
+seahorse_gkr_source_set_property (GObject *object, guint prop_id, const GValue *value,
GParamSpec *pspec)
{
- SeahorseGKeyringSource *gsrc = SEAHORSE_GKEYRING_SOURCE (object);
+ SeahorseGkrSource *gsrc = SEAHORSE_GKR_SOURCE (object);
switch (prop_id) {
case PROP_KEYRING_NAME:
@@ -702,13 +702,13 @@
}
static SeahorseOperation*
-seahorse_gkeyring_source_load (SeahorseSource *src, GQuark keyid)
+seahorse_gkr_source_load (SeahorseSource *src, GQuark keyid)
{
- SeahorseGKeyringSource *gsrc;
+ SeahorseGkrSource *gsrc;
SeahorseListOperation *lop;
g_assert (SEAHORSE_IS_SOURCE (src));
- gsrc = SEAHORSE_GKEYRING_SOURCE (src);
+ gsrc = SEAHORSE_GKR_SOURCE (src);
lop = start_list_operation (gsrc, keyid);
seahorse_multi_operation_take (gsrc->pv->operations, SEAHORSE_OPERATION (lop));
@@ -718,11 +718,11 @@
}
static SeahorseOperation*
-seahorse_gkeyring_source_import (SeahorseSource *sksrc, GInputStream *input)
+seahorse_gkr_source_import (SeahorseSource *sksrc, GInputStream *input)
{
GError *err = NULL;
- g_return_val_if_fail (SEAHORSE_IS_GKEYRING_SOURCE (sksrc), NULL);
+ g_return_val_if_fail (SEAHORSE_IS_GKR_SOURCE (sksrc), NULL);
g_return_val_if_fail (G_IS_INPUT_STREAM (input), NULL);
/* TODO: Implement properly */
@@ -731,11 +731,11 @@
}
static SeahorseOperation*
-seahorse_gkeyring_source_export (SeahorseSource *sksrc, GList *keys, GOutputStream *output)
+seahorse_gkr_source_export (SeahorseSource *sksrc, GList *keys, GOutputStream *output)
{
GError *err = NULL;
- g_return_val_if_fail (SEAHORSE_IS_GKEYRING_SOURCE (sksrc), NULL);
+ g_return_val_if_fail (SEAHORSE_IS_GKR_SOURCE (sksrc), NULL);
g_return_val_if_fail (G_IS_OUTPUT_STREAM (output), NULL);
/* TODO: Implement properly */
@@ -744,24 +744,24 @@
}
static SeahorseOperation*
-seahorse_gkeyring_source_remove (SeahorseSource *sksrc, SeahorseObject *sobj)
+seahorse_gkr_source_remove (SeahorseSource *sksrc, SeahorseObject *sobj)
{
- SeahorseGKeyringItem *git;
- SeahorseGKeyringSource *gsrc;
+ SeahorseGkrItem *git;
+ SeahorseGkrSource *gsrc;
- g_return_val_if_fail (SEAHORSE_IS_GKEYRING_ITEM (sobj), FALSE);
- git = SEAHORSE_GKEYRING_ITEM (sobj);
+ g_return_val_if_fail (SEAHORSE_IS_GKR_ITEM (sobj), FALSE);
+ git = SEAHORSE_GKR_ITEM (sobj);
- g_return_val_if_fail (SEAHORSE_IS_GKEYRING_SOURCE (sksrc), FALSE);
- gsrc = SEAHORSE_GKEYRING_SOURCE (sksrc);
+ g_return_val_if_fail (SEAHORSE_IS_GKR_SOURCE (sksrc), FALSE);
+ gsrc = SEAHORSE_GKR_SOURCE (sksrc);
return SEAHORSE_OPERATION (start_remove_operation (gsrc, git));
}
static void
-seahorse_gkeyring_source_dispose (GObject *gobject)
+seahorse_gkr_source_dispose (GObject *gobject)
{
- SeahorseGKeyringSource *gsrc;
+ SeahorseGkrSource *gsrc;
/*
* Note that after this executes the rest of the object should
@@ -771,7 +771,7 @@
* This function should also be able to run multiple times.
*/
- gsrc = SEAHORSE_GKEYRING_SOURCE (gobject);
+ gsrc = SEAHORSE_GKR_SOURCE (gobject);
g_assert (gsrc->pv);
/* Clear out all operations */
@@ -782,15 +782,15 @@
gsrc->pv->operations = NULL;
}
- G_OBJECT_CLASS (seahorse_gkeyring_source_parent_class)->dispose (gobject);
+ G_OBJECT_CLASS (seahorse_gkr_source_parent_class)->dispose (gobject);
}
static void
-seahorse_gkeyring_source_finalize (GObject *gobject)
+seahorse_gkr_source_finalize (GObject *gobject)
{
- SeahorseGKeyringSource *gsrc;
+ SeahorseGkrSource *gsrc;
- gsrc = SEAHORSE_GKEYRING_SOURCE (gobject);
+ gsrc = SEAHORSE_GKR_SOURCE (gobject);
g_assert (gsrc->pv);
g_assert (gsrc->pv->operations == NULL);
@@ -798,29 +798,29 @@
g_free (gsrc->pv->keyring_name);
g_free (gsrc->pv);
- G_OBJECT_CLASS (seahorse_gkeyring_source_parent_class)->finalize (gobject);
+ G_OBJECT_CLASS (seahorse_gkr_source_parent_class)->finalize (gobject);
}
static void
-seahorse_gkeyring_source_class_init (SeahorseGKeyringSourceClass *klass)
+seahorse_gkr_source_class_init (SeahorseGkrSourceClass *klass)
{
GObjectClass *gobject_class;
SeahorseSourceClass *key_class;
- seahorse_gkeyring_source_parent_class = g_type_class_peek_parent (klass);
+ seahorse_gkr_source_parent_class = g_type_class_peek_parent (klass);
gobject_class = G_OBJECT_CLASS (klass);
- gobject_class->constructor = seahorse_gkeyring_source_constructor;
- gobject_class->dispose = seahorse_gkeyring_source_dispose;
- gobject_class->finalize = seahorse_gkeyring_source_finalize;
- gobject_class->set_property = seahorse_gkeyring_source_set_property;
- gobject_class->get_property = seahorse_gkeyring_source_get_property;
+ gobject_class->constructor = seahorse_gkr_source_constructor;
+ gobject_class->dispose = seahorse_gkr_source_dispose;
+ gobject_class->finalize = seahorse_gkr_source_finalize;
+ gobject_class->set_property = seahorse_gkr_source_set_property;
+ gobject_class->get_property = seahorse_gkr_source_get_property;
key_class = SEAHORSE_SOURCE_CLASS (klass);
- key_class->load = seahorse_gkeyring_source_load;
- key_class->import = seahorse_gkeyring_source_import;
- key_class->export = seahorse_gkeyring_source_export;
- key_class->remove = seahorse_gkeyring_source_remove;
+ key_class->load = seahorse_gkr_source_load;
+ key_class->import = seahorse_gkr_source_import;
+ key_class->export = seahorse_gkr_source_export;
+ key_class->remove = seahorse_gkr_source_remove;
g_object_class_install_property (gobject_class, PROP_KEYRING_NAME,
g_param_spec_string ("keyring-name", "Keyring Name", "GNOME Keyring name",
@@ -843,21 +843,21 @@
0, G_MAXUINT, SEAHORSE_LOCATION_INVALID, G_PARAM_READABLE));
- seahorse_registry_register_type (NULL, SEAHORSE_TYPE_GKEYRING_SOURCE, "key-source", "local", SEAHORSE_GKR_STR, NULL);
+ seahorse_registry_register_type (NULL, SEAHORSE_TYPE_GKR_SOURCE, "key-source", "local", SEAHORSE_GKR_STR, NULL);
}
/* --------------------------------------------------------------------------
* PUBLIC
*/
-SeahorseGKeyringSource*
-seahorse_gkeyring_source_new (const gchar *keyring_name)
+SeahorseGkrSource*
+seahorse_gkr_source_new (const gchar *keyring_name)
{
- return g_object_new (SEAHORSE_TYPE_GKEYRING_SOURCE, "keyring-name", keyring_name, NULL);
+ return g_object_new (SEAHORSE_TYPE_GKR_SOURCE, "keyring-name", keyring_name, NULL);
}
const gchar*
-seahorse_gkeyring_source_get_keyring_name (SeahorseGKeyringSource *gsrc)
+seahorse_gkr_source_get_keyring_name (SeahorseGkrSource *gsrc)
{
return gsrc->pv->keyring_name;
}
Copied: trunk/gkr/seahorse-gkr-source.h (from r2629, /trunk/gkr/seahorse-gkeyring-source.h)
==============================================================================
--- /trunk/gkr/seahorse-gkeyring-source.h (original)
+++ trunk/gkr/seahorse-gkr-source.h Sun Nov 23 15:07:15 2008
@@ -20,7 +20,7 @@
*/
/**
- * SeahorseGKeyringSource: A key source for gnome-keyring credentials
+ * SeahorseGkrSource: A key source for gnome-keyring credentials
*
* - Derived from SeahorseSource
* - Adds the keys it loads to the SeahorseContext.
@@ -32,37 +32,37 @@
* source. (ie: SEAHORSE_LOCATION_LOCAL)
*/
-#ifndef __SEAHORSE_GKEYRING_SOURCE_H__
-#define __SEAHORSE_GKEYRING_SOURCE_H__
+#ifndef __SEAHORSE_GKR_SOURCE_H__
+#define __SEAHORSE_GKR_SOURCE_H__
#include "seahorse-source.h"
-#define SEAHORSE_TYPE_GKEYRING_SOURCE (seahorse_gkeyring_source_get_type ())
-#define SEAHORSE_GKEYRING_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_GKEYRING_SOURCE, SeahorseGKeyringSource))
-#define SEAHORSE_GKEYRING_SOURCE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_GKEYRING_SOURCE, SeahorseGKeyringSourceClass))
-#define SEAHORSE_IS_GKEYRING_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_GKEYRING_SOURCE))
-#define SEAHORSE_IS_GKEYRING_SOURCE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_GKEYRING_SOURCE))
-#define SEAHORSE_GKEYRING_SOURCE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_GKEYRING_SOURCE, SeahorseGKeyringSourceClass))
-
-typedef struct _SeahorseGKeyringSource SeahorseGKeyringSource;
-typedef struct _SeahorseGKeyringSourceClass SeahorseGKeyringSourceClass;
-typedef struct _SeahorseGKeyringSourcePrivate SeahorseGKeyringSourcePrivate;
+#define SEAHORSE_TYPE_GKR_SOURCE (seahorse_gkr_source_get_type ())
+#define SEAHORSE_GKR_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_GKR_SOURCE, SeahorseGkrSource))
+#define SEAHORSE_GKR_SOURCE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_GKR_SOURCE, SeahorseGkrSourceClass))
+#define SEAHORSE_IS_GKR_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_GKR_SOURCE))
+#define SEAHORSE_IS_GKR_SOURCE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_GKR_SOURCE))
+#define SEAHORSE_GKR_SOURCE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_GKR_SOURCE, SeahorseGkrSourceClass))
+
+typedef struct _SeahorseGkrSource SeahorseGkrSource;
+typedef struct _SeahorseGkrSourceClass SeahorseGkrSourceClass;
+typedef struct _SeahorseGkrSourcePrivate SeahorseGkrSourcePrivate;
-struct _SeahorseGKeyringSource {
+struct _SeahorseGkrSource {
SeahorseSource parent;
/*< private >*/
- SeahorseGKeyringSourcePrivate *pv;
+ SeahorseGkrSourcePrivate *pv;
};
-struct _SeahorseGKeyringSourceClass {
+struct _SeahorseGkrSourceClass {
SeahorseSourceClass parent_class;
};
-GType seahorse_gkeyring_source_get_type (void);
+GType seahorse_gkr_source_get_type (void);
-SeahorseGKeyringSource* seahorse_gkeyring_source_new (const gchar *keyring_name);
+SeahorseGkrSource* seahorse_gkr_source_new (const gchar *keyring_name);
-const gchar* seahorse_gkeyring_source_get_keyring_name (SeahorseGKeyringSource *gsrc);
+const gchar* seahorse_gkr_source_get_keyring_name (SeahorseGkrSource *gsrc);
-#endif /* __SEAHORSE_GKEYRING_SOURCE_H__ */
+#endif /* __SEAHORSE_GKR_SOURCE_H__ */
Modified: trunk/gkr/seahorse-gkr.c
==============================================================================
--- trunk/gkr/seahorse-gkr.c (original)
+++ trunk/gkr/seahorse-gkr.c Sun Nov 23 15:07:15 2008
@@ -20,14 +20,4 @@
*/
#include "seahorse-gkr.h"
-#include <stdlib.h>
-#include <string.h>
-
-
-
-
-
-
-
-
Modified: trunk/gkr/seahorse-gkr.h
==============================================================================
--- trunk/gkr/seahorse-gkr.h (original)
+++ trunk/gkr/seahorse-gkr.h Sun Nov 23 15:07:15 2008
@@ -27,11 +27,8 @@
G_BEGIN_DECLS
-
-
-#define SEAHORSE_GKEYRING_TYPE_STR "gnome-keyring"
-#define SEAHORSE_GKEYRING_TYPE g_quark_from_string ("gnome-keyring")
-
+#define SEAHORSE_GKR_TYPE_STR "gnome-keyring"
+#define SEAHORSE_GKR_TYPE g_quark_from_string ("gnome-keyring")
G_END_DECLS
Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in (original)
+++ trunk/po/POTFILES.in Sun Nov 23 15:07:15 2008
@@ -6,12 +6,12 @@
daemon/seahorse-service-keyset.c
daemon/seahorse-sharing.c
data/seahorse.schemas.in
-gkr/seahorse-gkeyring-item.c
-gkr/seahorse-gkeyring-item-properties.c
-gkr/seahorse-gkeyring-item-properties.glade
-gkr/seahorse-gkeyring-operation.c
-gkr/seahorse-gkeyring-source.c
-gkr/seahorse-gkr-commands.vala
+gkr/seahorse-gkr-item.c
+gkr/seahorse-gkr-item-properties.c
+gkr/seahorse-gkr-item-properties.glade
+gkr/seahorse-gkr-operation.c
+gkr/seahorse-gkr-source.c
+gkr/seahorse-gkr-commands.c
libcryptui/crui-x509-cert.c
libcryptui/crui-x509-cert-basics.c
libcryptui/crui-x509-cert-basics.glade
Modified: trunk/po/POTFILES.skip
==============================================================================
--- trunk/po/POTFILES.skip (original)
+++ trunk/po/POTFILES.skip Sun Nov 23 15:07:15 2008
@@ -1,6 +1,4 @@
-gkr/seahorse-gkr-commands.c
libcryptui/crui-x509-cert-basics.ui
-pkcs11/seahorse-pkcs11-certificate.c
pkcs11/seahorse-pkcs11-source.c
pgp/seahorse-pgp-commands.c
pgp/seahorse-pgp-generator.c
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
