simple-password-manager.h   simple-password-manager.h 
skipping to change at line 26 skipping to change at line 26
* License along with this library; if not, write to the Free Software * License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
*/ */
#ifndef __TP_SIMPLE_PASSWORD_MANAGER_H__ #ifndef __TP_SIMPLE_PASSWORD_MANAGER_H__
#define __TP_SIMPLE_PASSWORD_MANAGER_H__ #define __TP_SIMPLE_PASSWORD_MANAGER_H__
#include <gio/gio.h> #include <gio/gio.h>
#include <telepathy-glib/base-connection.h> #include <telepathy-glib/base-connection.h>
#include <telepathy-glib/base-password-channel.h>
G_BEGIN_DECLS G_BEGIN_DECLS
typedef struct _TpSimplePasswordManager TpSimplePasswordManager; typedef struct _TpSimplePasswordManager TpSimplePasswordManager;
typedef struct _TpSimplePasswordManagerClass TpSimplePasswordManagerClass; typedef struct _TpSimplePasswordManagerClass TpSimplePasswordManagerClass;
typedef struct _TpSimplePasswordManagerPrivate TpSimplePasswordManagerPriva te; typedef struct _TpSimplePasswordManagerPrivate TpSimplePasswordManagerPriva te;
struct _TpSimplePasswordManagerClass { struct _TpSimplePasswordManagerClass {
GObjectClass parent_class; GObjectClass parent_class;
/*<private>*/ /*<private>*/
skipping to change at line 74 skipping to change at line 75
TpBaseConnection *connection); TpBaseConnection *connection);
void tp_simple_password_manager_prompt_async ( void tp_simple_password_manager_prompt_async (
TpSimplePasswordManager *self, TpSimplePasswordManager *self,
GAsyncReadyCallback callback, gpointer user_data); GAsyncReadyCallback callback, gpointer user_data);
const GString * tp_simple_password_manager_prompt_finish ( const GString * tp_simple_password_manager_prompt_finish (
TpSimplePasswordManager *self, TpSimplePasswordManager *self,
GAsyncResult *result, GError **error); GAsyncResult *result, GError **error);
void tp_simple_password_manager_prompt_for_channel_async (
TpSimplePasswordManager *self,
TpBasePasswordChannel *channel,
GAsyncReadyCallback callback, gpointer user_data);
const GString * tp_simple_password_manager_prompt_for_channel_finish (
TpSimplePasswordManager *self,
GAsyncResult *result,
TpBasePasswordChannel **channel,
GError **error);
G_END_DECLS G_END_DECLS
#endif /* #ifndef __SIMPLE_PASSWORD_MANAGER_H__ */ #endif /* #ifndef __SIMPLE_PASSWORD_MANAGER_H__ */
 End of changes. 2 change blocks. 
0 lines changed or deleted 12 lines changed or added


 telepathy-interfaces.h   telepathy-interfaces.h 
skipping to change at line 833 skipping to change at line 833
#define TP_PROP_CHANNEL_INTERFACE_SASL_AUTHENTICATION_AUTHORIZATION_IDENTIT Y \ #define TP_PROP_CHANNEL_INTERFACE_SASL_AUTHENTICATION_AUTHORIZATION_IDENTIT Y \
"org.freedesktop.Telepathy.Channel.Interface.SASLAuthentication.Authorizati onIdentity" "org.freedesktop.Telepathy.Channel.Interface.SASLAuthentication.Authorizati onIdentity"
#define TP_PROP_CHANNEL_INTERFACE_SASL_AUTHENTICATION_DEFAULT_USERNAME \ #define TP_PROP_CHANNEL_INTERFACE_SASL_AUTHENTICATION_DEFAULT_USERNAME \
"org.freedesktop.Telepathy.Channel.Interface.SASLAuthentication.DefaultUser name" "org.freedesktop.Telepathy.Channel.Interface.SASLAuthentication.DefaultUser name"
#define TP_PROP_CHANNEL_INTERFACE_SASL_AUTHENTICATION_DEFAULT_REALM \ #define TP_PROP_CHANNEL_INTERFACE_SASL_AUTHENTICATION_DEFAULT_REALM \
"org.freedesktop.Telepathy.Channel.Interface.SASLAuthentication.DefaultReal m" "org.freedesktop.Telepathy.Channel.Interface.SASLAuthentication.DefaultReal m"
#define TP_PROP_CHANNEL_INTERFACE_SASL_AUTHENTICATION_MAY_SAVE_RESPONSE \
"org.freedesktop.Telepathy.Channel.Interface.SASLAuthentication.MaySaveResp
onse"
#define TP_IFACE_CHANNEL_INTERFACE_SECURABLE \ #define TP_IFACE_CHANNEL_INTERFACE_SECURABLE \
"org.freedesktop.Telepathy.Channel.Interface.Securable" "org.freedesktop.Telepathy.Channel.Interface.Securable"
#define TP_IFACE_QUARK_CHANNEL_INTERFACE_SECURABLE \ #define TP_IFACE_QUARK_CHANNEL_INTERFACE_SECURABLE \
(tp_iface_quark_channel_interface_securable ()) (tp_iface_quark_channel_interface_securable ())
GQuark tp_iface_quark_channel_interface_securable (void); GQuark tp_iface_quark_channel_interface_securable (void);
#define TP_PROP_CHANNEL_INTERFACE_SECURABLE_ENCRYPTED \ #define TP_PROP_CHANNEL_INTERFACE_SECURABLE_ENCRYPTED \
"org.freedesktop.Telepathy.Channel.Interface.Securable.Encrypted" "org.freedesktop.Telepathy.Channel.Interface.Securable.Encrypted"
 End of changes. 1 change blocks. 
0 lines changed or deleted 4 lines changed or added


 util.h   util.h 
skipping to change at line 148 skipping to change at line 148
} \ } \
G_STMT_END G_STMT_END
void tp_simple_async_report_success_in_idle (GObject *source, void tp_simple_async_report_success_in_idle (GObject *source,
GAsyncReadyCallback callback, gpointer user_data, gpointer source_tag); GAsyncReadyCallback callback, gpointer user_data, gpointer source_tag);
gint64 tp_user_action_time_from_x11 (guint32 x11_time); gint64 tp_user_action_time_from_x11 (guint32 x11_time);
gboolean tp_user_action_time_should_present (gint64 user_action_time, gboolean tp_user_action_time_should_present (gint64 user_action_time,
guint32 *x11_time); guint32 *x11_time);
gchar *tp_utf8_make_valid (const gchar *name);
G_END_DECLS G_END_DECLS
#undef __TP_IN_UTIL_H__ #undef __TP_IN_UTIL_H__
#endif /* __TP_UTIL_H__ */ #endif /* __TP_UTIL_H__ */
 End of changes. 1 change blocks. 
0 lines changed or deleted 2 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/