nautilus-sendto r274 - in trunk: . src/plugins
- From: hadess svn gnome org
- To: svn-commits-list gnome org
- Subject: nautilus-sendto r274 - in trunk: . src/plugins
- Date: Sun, 20 Jan 2008 13:33:05 +0000 (GMT)
Author: hadess
Date: Sun Jan 20 13:33:05 2008
New Revision: 274
URL: http://svn.gnome.org/viewvc/nautilus-sendto?rev=274&view=rev
Log:
2008-01-20 Bastien Nocera <hadess hadess net>
* src/plugins/pidgin.c: (add_pidgin_contacts_to_model):
Add support for Bonjour local contacts (Closes: #506818)
Modified:
trunk/ChangeLog
trunk/src/plugins/pidgin.c
Modified: trunk/src/plugins/pidgin.c
==============================================================================
--- trunk/src/plugins/pidgin.c (original)
+++ trunk/src/plugins/pidgin.c Sun Jan 20 13:33:05 2008
@@ -49,7 +49,7 @@
static void
add_pidgin_contacts_to_model (GtkListStore *store, GtkTreeIter *iter)
{
- GdkPixbuf *msn, *jabber, *yahoo, *aim, *icq;
+ GdkPixbuf *msn, *jabber, *yahoo, *aim, *icq, *bonjour;
GtkIconTheme *it;
GList *list = NULL;
GList *l;
@@ -92,7 +92,9 @@
aim = gtk_icon_theme_load_icon (it, "im-aim", 16,
GTK_ICON_LOOKUP_USE_BUILTIN, NULL);
icq = gtk_icon_theme_load_icon (it, "im-icq", 16,
- GTK_ICON_LOOKUP_USE_BUILTIN, NULL);
+ GTK_ICON_LOOKUP_USE_BUILTIN, NULL);
+ bonjour = gtk_icon_theme_load_icon (it, "network-wired", 16,
+ GTK_ICON_LOOKUP_USE_BUILTIN, NULL);
l = list;
while (l->next != NULL){
gchar *prt, *username, *cname, *alias;
@@ -116,34 +118,35 @@
gtk_list_store_set (store, iter, 0,
msn, 1, alias_e->str, -1);
contact_list = g_list_append (contact_list, contact_info);
- }else
- if (strcmp(prt,"prpl-jabber")==0){
- gtk_list_store_append (store, iter);
- gtk_list_store_set (store, iter, 0,
- jabber, 1, alias_e->str, -1);
- contact_list = g_list_append (contact_list, contact_info);
- }else
- if (strcmp(prt,"prpl-aim")==0){
- gtk_list_store_append (store, iter);
- gtk_list_store_set (store, iter, 0,
- aim, 1, alias_e->str, -1);
- contact_list = g_list_append (contact_list, contact_info);
- }else
- if (strcmp(prt,"prpl-yahoo")==0){
- gtk_list_store_append (store, iter);
- gtk_list_store_set (store, iter, 0,
- yahoo, 1, alias_e->str, -1);
- contact_list = g_list_append (contact_list, contact_info);
- }else
- if(strcmp(prt,"prpl-icq")==0) {
- gtk_list_store_append (store, iter);
- gtk_list_store_set (store, iter, 0,
- icq, 1, alias_e->str, -1);
- contact_list = g_list_append (contact_list, contact_info);
- }else {
- g_free (contact_info);
- }
-
+ }else if (strcmp(prt,"prpl-jabber")==0){
+ gtk_list_store_append (store, iter);
+ gtk_list_store_set (store, iter, 0,
+ jabber, 1, alias_e->str, -1);
+ contact_list = g_list_append (contact_list, contact_info);
+ }else if (strcmp(prt,"prpl-aim")==0){
+ gtk_list_store_append (store, iter);
+ gtk_list_store_set (store, iter, 0,
+ aim, 1, alias_e->str, -1);
+ contact_list = g_list_append (contact_list, contact_info);
+ }else if (strcmp(prt,"prpl-yahoo")==0){
+ gtk_list_store_append (store, iter);
+ gtk_list_store_set (store, iter, 0,
+ yahoo, 1, alias_e->str, -1);
+ contact_list = g_list_append (contact_list, contact_info);
+ }else if(strcmp(prt,"prpl-icq")==0) {
+ gtk_list_store_append (store, iter);
+ gtk_list_store_set (store, iter, 0,
+ icq, 1, alias_e->str, -1);
+ contact_list = g_list_append (contact_list, contact_info);
+ } else if(strcmp(prt,"prpl-bonjour")==0) {
+ gtk_list_store_append (store, iter);
+ gtk_list_store_set (store, iter, 0,
+ bonjour, 1, alias_e->str, -1);
+ contact_list = g_list_append (contact_list, contact_info);
+ }else {
+ g_free (contact_info);
+ }
+
g_string_free(alias_e, TRUE);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]