goabackendenums.h   goabackendenums.h 
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
/* /*
* Copyright (C) 2011 Red Hat, Inc. * Copyright (C) 2011, 2012 Red Hat, Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either * License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version. * version 2 of the License, or (at your option) any later version.
* *
* This library is distributed in the hope that it will be useful, * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General * You should have received a copy of the GNU Lesser General
* Public License along with this library; if not, write to the * Public License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place, Suite 330, * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
* *
* Author: David Zeuthen <davidz@redhat.com> * Authors: David Zeuthen <davidz@redhat.com>
* Debarshi Ray <debarshir@gnome.org>
*/ */
#if !defined (__GOA_BACKEND_INSIDE_GOA_BACKEND_H__) && !defined (GOA_BACKEN D_COMPILATION) #if !defined (__GOA_BACKEND_INSIDE_GOA_BACKEND_H__) && !defined (GOA_BACKEN D_COMPILATION)
#error "Only <goabackend/goabackend.h> can be included directly." #error "Only <goabackend/goabackend.h> can be included directly."
#endif #endif
#ifndef __GOA_BACKEND_ENUMS_H__ #ifndef __GOA_BACKEND_ENUMS_H__
#define __GOA_BACKEND_ENUMS_H__ #define __GOA_BACKEND_ENUMS_H__
#include <gio/gio.h> #include <gio/gio.h>
skipping to change at line 53 skipping to change at line 54
*/ */
typedef enum typedef enum
{ {
GOA_LOG_LEVEL_DEBUG, GOA_LOG_LEVEL_DEBUG,
GOA_LOG_LEVEL_INFO, GOA_LOG_LEVEL_INFO,
GOA_LOG_LEVEL_NOTICE, GOA_LOG_LEVEL_NOTICE,
GOA_LOG_LEVEL_WARNING, GOA_LOG_LEVEL_WARNING,
GOA_LOG_LEVEL_ERROR GOA_LOG_LEVEL_ERROR
} GoaLogLevel; } GoaLogLevel;
/**
* GoaProviderGroup:
* @GOA_PROVIDER_GROUP_BRANDED: Providers with a well-known brand. For
* example, Google and Facebook.
* @GOA_PROVIDER_GROUP_CONTACTS: Providers that offer address book services
.
* For example, CardDAV.
* @GOA_PROVIDER_GROUP_MAIL: Providers that offer email-like messaging
* services. For example, IMAP and SMTP.
* @GOA_PROVIDER_GROUP_TICKETING: Providers with ticketing
* capabilities. For example, Kerberos.
* @GOA_PROVIDER_GROUP_INVALID: Used for error handling. No provider
* should belong to this group.
*
* An enum for specifying which group a provider belongs to. This is
* can be used to organize the providers while displaying them in an
* user interface.
*/
typedef enum
{
GOA_PROVIDER_GROUP_BRANDED,
GOA_PROVIDER_GROUP_CONTACTS,
GOA_PROVIDER_GROUP_MAIL,
GOA_PROVIDER_GROUP_TICKETING,
GOA_PROVIDER_GROUP_INVALID
} GoaProviderGroup;
G_END_DECLS G_END_DECLS
#endif /* __GOA_BACKEND_ENUMS_H__ */ #endif /* __GOA_BACKEND_ENUMS_H__ */
 End of changes. 3 change blocks. 
2 lines changed or deleted 30 lines changed or added


 goabackendenumtypes.h   goabackendenumtypes.h 
skipping to change at line 14 skipping to change at line 14
#ifndef __GOA_BACKEND_ENUM_TYPES_H__ #ifndef __GOA_BACKEND_ENUM_TYPES_H__
#define __GOA_BACKEND_ENUM_TYPES_H__ #define __GOA_BACKEND_ENUM_TYPES_H__
#include <glib-object.h> #include <glib-object.h>
G_BEGIN_DECLS G_BEGIN_DECLS
/* enumerations from "goabackendenums.h" */ /* enumerations from "goabackendenums.h" */
GType goa_log_level_get_type (void) G_GNUC_CONST; GType goa_log_level_get_type (void) G_GNUC_CONST;
#define GOA_TYPE_LOG_LEVEL (goa_log_level_get_type ()) #define GOA_TYPE_LOG_LEVEL (goa_log_level_get_type ())
GType goa_provider_group_get_type (void) G_GNUC_CONST;
#define GOA_TYPE_PROVIDER_GROUP (goa_provider_group_get_type ())
G_END_DECLS G_END_DECLS
#endif /* __GOA_BACKEND_ENUM_TYPES_H__ */ #endif /* __GOA_BACKEND_ENUM_TYPES_H__ */
/* Generated data ends here */ /* Generated data ends here */
 End of changes. 1 change blocks. 
0 lines changed or deleted 2 lines changed or added


 goaprovider.h   goaprovider.h 
skipping to change at line 64 skipping to change at line 64
GObject parent_instance; GObject parent_instance;
GoaProviderPrivate *priv; GoaProviderPrivate *priv;
}; };
/** /**
* GoaProviderClass: * GoaProviderClass:
* @parent_class: The parent class. * @parent_class: The parent class.
* @get_provider_type: Virtual function for goa_provider_get_provider_type( ). * @get_provider_type: Virtual function for goa_provider_get_provider_type( ).
* @get_provider_name: Virtual function for goa_provider_get_provider_name( ). * @get_provider_name: Virtual function for goa_provider_get_provider_name( ).
* @get_provider_icon: Virtual function for goa_provider_get_provider_icon( ). * @get_provider_icon: Virtual function for goa_provider_get_provider_icon( ).
* @get_provider_group: Virtual function for goa_provider_get_provider_grou p().
* @add_account: Virtual function for goa_provider_add_account(). * @add_account: Virtual function for goa_provider_add_account().
* @refresh_account: Virtual function for goa_provider_refresh_account(). * @refresh_account: Virtual function for goa_provider_refresh_account().
* @build_object: Virtual function for goa_provider_build_object(). * @build_object: Virtual function for goa_provider_build_object().
* @ensure_credentials_sync: Virtual function for goa_provider_ensure_crede ntials_sync(). * @ensure_credentials_sync: Virtual function for goa_provider_ensure_crede ntials_sync().
* @show_account: Virtual function for goa_provider_show_account(). * @show_account: Virtual function for goa_provider_show_account().
* @get_credentials_generation: Virtual function for goa_provider_get_crede ntials_generation(). * @get_credentials_generation: Virtual function for goa_provider_get_crede ntials_generation().
* *
* Class structure for #GoaProvider. * Class structure for #GoaProvider.
*/ */
struct _GoaProviderClass struct _GoaProviderClass
skipping to change at line 114 skipping to change at line 115
GCancellable *cancellable, GCancellable *cancellable,
GError **error); GError **error);
void (*show_account) (GoaProvider *provider, void (*show_account) (GoaProvider *provider,
GoaClient *client, GoaClient *client,
GoaObject *object, GoaObject *object,
GtkBox *vbox, GtkBox *vbox,
GtkGrid *left, GtkGrid *left,
GtkGrid *right); GtkGrid *right);
guint (*get_credentials_generation) (GoaProvider *provider); guint (*get_credentials_generation) (GoaProvider *provider);
/* pure virtual */
GoaProviderGroup (*get_provider_group) (GoaProvider *provider);
/*< private >*/ /*< private >*/
/* Padding for future expansion */ /* Padding for future expansion */
gpointer goa_reserved[32]; gpointer goa_reserved[32];
}; };
GType goa_provider_get_type (void) G_GNUC_CONST; GType goa_provider_get_type (void) G_GNUC_CONST;
const gchar *goa_provider_get_provider_type (GoaProvider *p rovider); const gchar *goa_provider_get_provider_type (GoaProvider *p rovider);
gchar *goa_provider_get_provider_name (GoaProvider *p rovider, gchar *goa_provider_get_provider_name (GoaProvider *p rovider,
GoaObject *o bject); GoaObject *o bject);
GIcon *goa_provider_get_provider_icon (GoaProvider *p rovider, GIcon *goa_provider_get_provider_icon (GoaProvider *p rovider,
GoaObject *o bject); GoaObject *o bject);
GoaProviderGroup goa_provider_get_provider_group (GoaProvider *p rovider);
GoaObject *goa_provider_add_account (GoaProvider *p rovider, GoaObject *goa_provider_add_account (GoaProvider *p rovider,
GoaClient *c lient, GoaClient *c lient,
GtkDialog *d ialog, GtkDialog *d ialog,
GtkBox *v box, GtkBox *v box,
GError **e rror); GError **e rror);
gboolean goa_provider_refresh_account (GoaProvider *p rovider, gboolean goa_provider_refresh_account (GoaProvider *p rovider,
GoaClient *c lient, GoaClient *c lient,
GoaObject *o bject, GoaObject *o bject,
GtkWindow *p arent, GtkWindow *p arent,
GError **e rror); GError **e rror);
 End of changes. 3 change blocks. 
0 lines changed or deleted 5 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/