aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2009-12-16 02:03:36 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2009-12-17 18:38:49 +0800
commitb650895f8d148260d1220342692b834eebb0038b (patch)
tree5f7aa66b62fcd07fd56c0fc86666a2323cb32d3f /libempathy-gtk
parentbd731dbfa05556c02013ed8453b10ac57b218306 (diff)
downloadgsoc2013-empathy-b650895f8d148260d1220342692b834eebb0038b.tar
gsoc2013-empathy-b650895f8d148260d1220342692b834eebb0038b.tar.gz
gsoc2013-empathy-b650895f8d148260d1220342692b834eebb0038b.tar.bz2
gsoc2013-empathy-b650895f8d148260d1220342692b834eebb0038b.tar.lz
gsoc2013-empathy-b650895f8d148260d1220342692b834eebb0038b.tar.xz
gsoc2013-empathy-b650895f8d148260d1220342692b834eebb0038b.tar.zst
gsoc2013-empathy-b650895f8d148260d1220342692b834eebb0038b.zip
empathy-new-message-dialog: port to TP coding style
We rewrote most of this file any way.
Diffstat (limited to 'libempathy-gtk')
-rw-r--r--libempathy-gtk/empathy-new-message-dialog.c104
-rw-r--r--libempathy-gtk/empathy-new-message-dialog.h1
2 files changed, 53 insertions, 52 deletions
diff --git a/libempathy-gtk/empathy-new-message-dialog.c b/libempathy-gtk/empathy-new-message-dialog.c
index d5c13873a..ca20b4005 100644
--- a/libempathy-gtk/empathy-new-message-dialog.c
+++ b/libempathy-gtk/empathy-new-message-dialog.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
* Copyright (C) 2007-2008 Collabora Ltd.
*
@@ -44,7 +43,7 @@
static EmpathyNewMessageDialog *dialog_singleton = NULL;
G_DEFINE_TYPE(EmpathyNewMessageDialog, empathy_new_message_dialog,
- EMPATHY_TYPE_CONTACT_SELECTOR_DIALOG)
+ EMPATHY_TYPE_CONTACT_SELECTOR_DIALOG)
/**
* SECTION:empathy-new-message-dialog
@@ -58,70 +57,72 @@ G_DEFINE_TYPE(EmpathyNewMessageDialog, empathy_new_message_dialog,
static void
empathy_new_message_dialog_got_response (EmpathyContactSelectorDialog *dialog,
- TpConnection *connection,
- const gchar *contact_id)
+ TpConnection *connection,
+ const gchar *contact_id)
{
- empathy_dispatcher_chat_with_contact_id (connection, contact_id, NULL, NULL);
+ empathy_dispatcher_chat_with_contact_id (connection, contact_id, NULL, NULL);
}
static GObject *
empathy_new_message_dialog_constructor (GType type,
- guint n_props,
- GObjectConstructParam *props)
+ guint n_props,
+ GObjectConstructParam *props)
{
- GObject *retval;
-
- if (dialog_singleton) {
- retval = G_OBJECT (dialog_singleton);
- g_object_ref (retval);
- }
- else {
- retval = G_OBJECT_CLASS (
- empathy_new_message_dialog_parent_class)->constructor (type,
- n_props, props);
-
- dialog_singleton = EMPATHY_NEW_MESSAGE_DIALOG (retval);
- g_object_add_weak_pointer (retval, (gpointer) &dialog_singleton);
- }
-
- return retval;
+ GObject *retval;
+
+ if (dialog_singleton)
+ {
+ retval = G_OBJECT (dialog_singleton);
+ g_object_ref (retval);
+ }
+ else
+ {
+ retval = G_OBJECT_CLASS (
+ empathy_new_message_dialog_parent_class)->constructor (type,
+ n_props, props);
+
+ dialog_singleton = EMPATHY_NEW_MESSAGE_DIALOG (retval);
+ g_object_add_weak_pointer (retval, (gpointer) &dialog_singleton);
+ }
+
+ return retval;
}
static void
empathy_new_message_dialog_init (EmpathyNewMessageDialog *dialog)
{
- EmpathyContactSelectorDialog *parent = EMPATHY_CONTACT_SELECTOR_DIALOG (
- dialog);
- GtkWidget *image;
+ EmpathyContactSelectorDialog *parent = EMPATHY_CONTACT_SELECTOR_DIALOG (
+ dialog);
+ GtkWidget *image;
- /* add chat button */
- parent->button_action = gtk_button_new_with_mnemonic (_("C_hat"));
- image = gtk_image_new_from_icon_name (EMPATHY_IMAGE_NEW_MESSAGE,
- GTK_ICON_SIZE_BUTTON);
- gtk_button_set_image (GTK_BUTTON (parent->button_action), image);
+ /* add chat button */
+ parent->button_action = gtk_button_new_with_mnemonic (_("C_hat"));
+ image = gtk_image_new_from_icon_name (EMPATHY_IMAGE_NEW_MESSAGE,
+ GTK_ICON_SIZE_BUTTON);
+ gtk_button_set_image (GTK_BUTTON (parent->button_action), image);
- gtk_dialog_add_action_widget (GTK_DIALOG (dialog), parent->button_action,
- GTK_RESPONSE_ACCEPT);
- gtk_widget_show (parent->button_action);
+ gtk_dialog_add_action_widget (GTK_DIALOG (dialog), parent->button_action,
+ GTK_RESPONSE_ACCEPT);
+ gtk_widget_show (parent->button_action);
- /* Tweak the dialog */
- gtk_window_set_title (GTK_WINDOW (dialog), _("New Conversation"));
- gtk_window_set_role (GTK_WINDOW (dialog), "new_message");
+ /* Tweak the dialog */
+ gtk_window_set_title (GTK_WINDOW (dialog), _("New Conversation"));
+ gtk_window_set_role (GTK_WINDOW (dialog), "new_message");
- gtk_widget_set_sensitive (parent->button_action, FALSE);
+ gtk_widget_set_sensitive (parent->button_action, FALSE);
}
static void
empathy_new_message_dialog_class_init (
EmpathyNewMessageDialogClass *class)
{
- GObjectClass *object_class = G_OBJECT_CLASS (class);
- EmpathyContactSelectorDialogClass *dialog_class = \
- EMPATHY_CONTACT_SELECTOR_DIALOG_CLASS (class);
+ GObjectClass *object_class = G_OBJECT_CLASS (class);
+ EmpathyContactSelectorDialogClass *dialog_class = \
+ EMPATHY_CONTACT_SELECTOR_DIALOG_CLASS (class);
- object_class->constructor = empathy_new_message_dialog_constructor;
+ object_class->constructor = empathy_new_message_dialog_constructor;
- dialog_class->got_response = empathy_new_message_dialog_got_response;
+ dialog_class->got_response = empathy_new_message_dialog_got_response;
}
/**
@@ -135,15 +136,16 @@ empathy_new_message_dialog_class_init (
GtkWidget *
empathy_new_message_dialog_show (GtkWindow *parent)
{
- GtkWidget *dialog;
+ GtkWidget *dialog;
- dialog = g_object_new (EMPATHY_TYPE_NEW_MESSAGE_DIALOG, NULL);
+ dialog = g_object_new (EMPATHY_TYPE_NEW_MESSAGE_DIALOG, NULL);
- if (parent) {
- gtk_window_set_transient_for (GTK_WINDOW (dialog),
- GTK_WINDOW (parent));
- }
+ if (parent)
+ {
+ gtk_window_set_transient_for (GTK_WINDOW (dialog),
+ GTK_WINDOW (parent));
+ }
- gtk_widget_show (dialog);
- return dialog;
+ gtk_widget_show (dialog);
+ return dialog;
}
diff --git a/libempathy-gtk/empathy-new-message-dialog.h b/libempathy-gtk/empathy-new-message-dialog.h
index 95dbae8a0..6d02e8e31 100644
--- a/libempathy-gtk/empathy-new-message-dialog.h
+++ b/libempathy-gtk/empathy-new-message-dialog.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
* Copyright (C) 2007-2008 Collabora Ltd.
*