diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2009-05-18 23:02:04 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2009-05-18 23:07:16 +0800 |
| commit | a54165a8bf8af0f5b507f0c670c2c4d1b4428d46 (patch) | |
| tree | 5afd882c5751d72e3c977876de9c19f346dd47a6 | |
| parent | 914b9e47e2f96865e7dcfce92f3237a3ff8086fc (diff) | |
| download | gsoc2013-empathy-a54165a8bf8af0f5b507f0c670c2c4d1b4428d46.tar gsoc2013-empathy-a54165a8bf8af0f5b507f0c670c2c4d1b4428d46.tar.gz gsoc2013-empathy-a54165a8bf8af0f5b507f0c670c2c4d1b4428d46.tar.bz2 gsoc2013-empathy-a54165a8bf8af0f5b507f0c670c2c4d1b4428d46.tar.lz gsoc2013-empathy-a54165a8bf8af0f5b507f0c670c2c4d1b4428d46.tar.xz gsoc2013-empathy-a54165a8bf8af0f5b507f0c670c2c4d1b4428d46.tar.zst gsoc2013-empathy-a54165a8bf8af0f5b507f0c670c2c4d1b4428d46.zip | |
empathy-contact-list-view: fix coding style and update FSF address
| -rw-r--r-- | libempathy-gtk/empathy-contact-list-view.c | 20 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-contact-list-view.h | 4 |
2 files changed, 12 insertions, 12 deletions
diff --git a/libempathy-gtk/empathy-contact-list-view.c b/libempathy-gtk/empathy-contact-list-view.c index ca224f526..a88e34bca 100644 --- a/libempathy-gtk/empathy-contact-list-view.c +++ b/libempathy-gtk/empathy-contact-list-view.c @@ -15,8 +15,8 @@ * * You should have received a copy of the GNU General Public * License along with this program; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, + * Boston, MA 02110-1301 USA * * Authors: Mikael Hallendal <micke@imendio.com> * Martyn Russell <martyn@imendio.com> @@ -488,7 +488,7 @@ contact_list_view_drag_data_get (GtkWidget *widget, switch (info) { case DND_DRAG_TYPE_CONTACT_ID: gtk_selection_data_set (selection, drag_atoms_source[info], 8, - (guchar*)str, strlen (str) + 1); + (guchar *) str, strlen (str) + 1); break; } @@ -1181,7 +1181,7 @@ empathy_contact_list_view_init (EmpathyContactListView *view) /* Get saved group states. */ empathy_contact_groups_get_all (); - gtk_tree_view_set_row_separator_func (GTK_TREE_VIEW (view), + gtk_tree_view_set_row_separator_func (GTK_TREE_VIEW (view), empathy_contact_list_store_row_separator_func, NULL, NULL); @@ -1275,8 +1275,8 @@ empathy_contact_list_view_get_selected_group (EmpathyContactListView *view) } static gboolean -contact_list_view_remove_dialog_show (GtkWindow *parent, - const gchar *message, +contact_list_view_remove_dialog_show (GtkWindow *parent, + const gchar *message, const gchar *secondary_text) { GtkWidget *dialog; @@ -1291,9 +1291,9 @@ contact_list_view_remove_dialog_show (GtkWindow *parent, NULL); gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s", secondary_text); - + gtk_widget_show (dialog); - + res = gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); @@ -1387,7 +1387,7 @@ contact_list_view_remove_activate_cb (GtkMenuItem *menuitem, contact = empathy_contact_list_view_dup_selected (view); if (contact) { - gchar *text; + gchar *text; GtkWindow *parent; parent = empathy_get_toplevel_window (GTK_WIDGET (view)); @@ -1397,7 +1397,7 @@ contact_list_view_remove_activate_cb (GtkMenuItem *menuitem, EmpathyContactList *list; list = empathy_contact_list_store_get_list_iface (priv->store); - empathy_contact_list_remove (list, contact, + empathy_contact_list_remove (list, contact, _("Sorry, I don't want you in my contact list anymore.")); } diff --git a/libempathy-gtk/empathy-contact-list-view.h b/libempathy-gtk/empathy-contact-list-view.h index bb6766c4a..0c48764c4 100644 --- a/libempathy-gtk/empathy-contact-list-view.h +++ b/libempathy-gtk/empathy-contact-list-view.h @@ -15,8 +15,8 @@ * * You should have received a copy of the GNU General Public * License along with this program; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, + * Boston, MA 02110-1301 USA * * Authors: Mikael Hallendal <micke@imendio.com> * Martyn Russell <martyn@imendio.com> |