Mercurial > pidgin.yaz
comparison pidgin/gtkaccount.c @ 15439:a415922e2882
merge of '8f5c72b9dbcf628f35e4674469f97b34f9c6fa2c'
and 'e082ba7b9cfaf0fef0531d0fe9b54af7831f75df'
author | Ethan Blanton <elb@pidgin.im> |
---|---|
date | Sun, 28 Jan 2007 01:24:15 +0000 |
parents | 42961709cb30 |
children | dc69d7b760ad |
comparison
equal
deleted
inserted
replaced
15426:c9497aad9fc4 | 15439:a415922e2882 |
---|---|
1561 g_object_unref(G_OBJECT(pulse_data->online_pixbuf)); | 1561 g_object_unref(G_OBJECT(pulse_data->online_pixbuf)); |
1562 | 1562 |
1563 g_free(pulse_data); | 1563 g_free(pulse_data); |
1564 } | 1564 } |
1565 | 1565 |
1566 pixbuf = gaim_gtk_create_prpl_icon(account, 0.5); | 1566 pixbuf = gaim_gtk_create_prpl_icon(account, PIDGIN_PRPL_ICON_MEDIUM); |
1567 if ((pixbuf != NULL) && gaim_account_is_disconnected(account)) | 1567 if ((pixbuf != NULL) && gaim_account_is_disconnected(account)) |
1568 gdk_pixbuf_saturate_and_pixelate(pixbuf, pixbuf, 0.0, FALSE); | 1568 gdk_pixbuf_saturate_and_pixelate(pixbuf, pixbuf, 0.0, FALSE); |
1569 | 1569 |
1570 gtk_list_store_set(accounts_window->model, &iter, | 1570 gtk_list_store_set(accounts_window->model, &iter, |
1571 COLUMN_ICON, pixbuf, | 1571 COLUMN_ICON, pixbuf, |
1940 column = gtk_tree_view_column_new(); | 1940 column = gtk_tree_view_column_new(); |
1941 gtk_tree_view_column_set_title(column, _("Screen Name")); | 1941 gtk_tree_view_column_set_title(column, _("Screen Name")); |
1942 gtk_tree_view_insert_column(GTK_TREE_VIEW(treeview), column, -1); | 1942 gtk_tree_view_insert_column(GTK_TREE_VIEW(treeview), column, -1); |
1943 gtk_tree_view_column_set_resizable(column, TRUE); | 1943 gtk_tree_view_column_set_resizable(column, TRUE); |
1944 | 1944 |
1945 /* Status Icon */ | 1945 /* Buddy Icon */ |
1946 renderer = gtk_cell_renderer_pixbuf_new(); | 1946 renderer = gtk_cell_renderer_pixbuf_new(); |
1947 gtk_tree_view_column_pack_start(column, renderer, FALSE); | 1947 gtk_tree_view_column_pack_start(column, renderer, FALSE); |
1948 gtk_tree_view_column_add_attribute(column, renderer, | 1948 gtk_tree_view_column_add_attribute(column, renderer, |
1949 "pixbuf", COLUMN_BUDDYICON); | 1949 "pixbuf", COLUMN_BUDDYICON); |
1950 | 1950 |
1980 const char *path; | 1980 const char *path; |
1981 GdkPixbuf *pixbuf; | 1981 GdkPixbuf *pixbuf; |
1982 GdkPixbuf *statusicon_pixbuf; | 1982 GdkPixbuf *statusicon_pixbuf; |
1983 GdkPixbuf *statusicon_pixbuf_scaled; | 1983 GdkPixbuf *statusicon_pixbuf_scaled; |
1984 | 1984 |
1985 pixbuf = gaim_gtk_create_prpl_icon(account, 0.5); | 1985 pixbuf = gaim_gtk_create_prpl_icon(account, PIDGIN_PRPL_ICON_MEDIUM); |
1986 if ((pixbuf != NULL) && gaim_account_is_disconnected(account)) | 1986 if ((pixbuf != NULL) && gaim_account_is_disconnected(account)) |
1987 gdk_pixbuf_saturate_and_pixelate(pixbuf, pixbuf, 0.0, FALSE); | 1987 gdk_pixbuf_saturate_and_pixelate(pixbuf, pixbuf, 0.0, FALSE); |
1988 | 1988 |
1989 if (gaim_account_get_bool(account, "use-global-buddyicon", TRUE)) | 1989 if (gaim_account_get_bool(account, "use-global-buddyicon", TRUE)) |
1990 path = gaim_prefs_get_path("/gaim/gtk/accounts/buddyicon"); | 1990 path = gaim_prefs_get_path("/gaim/gtk/accounts/buddyicon"); |
1994 statusicon_pixbuf = gdk_pixbuf_new_from_file(path, NULL); | 1994 statusicon_pixbuf = gdk_pixbuf_new_from_file(path, NULL); |
1995 else | 1995 else |
1996 statusicon_pixbuf = NULL; | 1996 statusicon_pixbuf = NULL; |
1997 | 1997 |
1998 if (statusicon_pixbuf) { | 1998 if (statusicon_pixbuf) { |
1999 statusicon_pixbuf_scaled = gdk_pixbuf_scale_simple(statusicon_pixbuf, 16, 16, GDK_INTERP_HYPER); | 1999 statusicon_pixbuf_scaled = gdk_pixbuf_scale_simple(statusicon_pixbuf, 22, 22, GDK_INTERP_HYPER); |
2000 } else { | 2000 } else { |
2001 statusicon_pixbuf_scaled = NULL; | 2001 statusicon_pixbuf_scaled = NULL; |
2002 } | 2002 } |
2003 | 2003 |
2004 gtk_list_store_set(store, iter, | 2004 gtk_list_store_set(store, iter, |
2128 | 2128 |
2129 /* Create a helpful first-time-use label */ | 2129 /* Create a helpful first-time-use label */ |
2130 label = gtk_label_new(NULL); | 2130 label = gtk_label_new(NULL); |
2131 /* Translators: Please maintain the use of -> or <- to represent the menu heirarchy */ | 2131 /* Translators: Please maintain the use of -> or <- to represent the menu heirarchy */ |
2132 pretty = gaim_gtk_make_pretty_arrows(_( | 2132 pretty = gaim_gtk_make_pretty_arrows(_( |
2133 "<span size='larger' weight='bold'>Welcome to Gaim!</span>\n\n" | 2133 "<span size='larger' weight='bold'>Welcome to " PIDGIN_NAME "!</span>\n\n" |
2134 | 2134 |
2135 "You have no IM accounts configured. To start connecting with Gaim " | 2135 "You have no IM accounts configured. To start connecting with " PIDGIN_NAME " " |
2136 "press the <b>Add</b> button below and configure your first " | 2136 "press the <b>Add</b> button below and configure your first " |
2137 "account. If you want Gaim to connect to multiple IM accounts, " | 2137 "account. If you want " PIDGIN_NAME " to connect to multiple IM accounts, " |
2138 "press <b>Add</b> again to configure them all.\n\n" | 2138 "press <b>Add</b> again to configure them all.\n\n" |
2139 | 2139 |
2140 "You can come back to this window to add, edit, or remove " | 2140 "You can come back to this window to add, edit, or remove " |
2141 "accounts from <b>Accounts->Add/Edit</b> in the Buddy " | 2141 "accounts from <b>Accounts->Add/Edit</b> in the Buddy " |
2142 "List window")); | 2142 "List window")); |
2400 GtkWidget *alert; | 2400 GtkWidget *alert; |
2401 | 2401 |
2402 gc = gaim_account_get_connection(account); | 2402 gc = gaim_account_get_connection(account); |
2403 | 2403 |
2404 buffer = make_info(account, gc, remote_user, id, alias, msg); | 2404 buffer = make_info(account, gc, remote_user, id, alias, msg); |
2405 alert = gaim_gtk_make_mini_dialog(gc, GAIM_STOCK_DIALOG_INFO, buffer, | 2405 alert = gaim_gtk_make_mini_dialog(gc, PIDGIN_STOCK_DIALOG_INFO, buffer, |
2406 NULL, NULL, _("Close"), NULL, NULL); | 2406 NULL, NULL, _("Close"), NULL, NULL); |
2407 gaim_gtk_blist_add_alert(alert); | 2407 gaim_gtk_blist_add_alert(alert); |
2408 | 2408 |
2409 g_free(buffer); | 2409 g_free(buffer); |
2410 } | 2410 } |
2425 data->account = account; | 2425 data->account = account; |
2426 data->username = g_strdup(remote_user); | 2426 data->username = g_strdup(remote_user); |
2427 data->alias = g_strdup(alias); | 2427 data->alias = g_strdup(alias); |
2428 | 2428 |
2429 buffer = make_info(account, gc, remote_user, id, alias, msg); | 2429 buffer = make_info(account, gc, remote_user, id, alias, msg); |
2430 alert = gaim_gtk_make_mini_dialog(gc, GAIM_STOCK_DIALOG_QUESTION, | 2430 alert = gaim_gtk_make_mini_dialog(gc, PIDGIN_STOCK_DIALOG_QUESTION, |
2431 _("Add buddy to your list?"), buffer, data, | 2431 _("Add buddy to your list?"), buffer, data, |
2432 _("Add"), G_CALLBACK(add_user_cb), | 2432 _("Add"), G_CALLBACK(add_user_cb), |
2433 _("Cancel"), G_CALLBACK(free_add_user_data), NULL); | 2433 _("Cancel"), G_CALLBACK(free_add_user_data), NULL); |
2434 gaim_gtk_blist_add_alert(alert); | 2434 gaim_gtk_blist_add_alert(alert); |
2435 | 2435 |
2500 aa->deny_cb = (GaimAccountRequestAuthorizationCb)deny_cb; | 2500 aa->deny_cb = (GaimAccountRequestAuthorizationCb)deny_cb; |
2501 aa->data = user_data; | 2501 aa->data = user_data; |
2502 aa->username = g_strdup(remote_user); | 2502 aa->username = g_strdup(remote_user); |
2503 aa->alias = g_strdup(alias); | 2503 aa->alias = g_strdup(alias); |
2504 aa->account = account; | 2504 aa->account = account; |
2505 alert = gaim_gtk_make_mini_dialog(gc, GAIM_STOCK_DIALOG_QUESTION, | 2505 alert = gaim_gtk_make_mini_dialog(gc, PIDGIN_STOCK_DIALOG_QUESTION, |
2506 _("Authorize buddy?"), buffer, aa, | 2506 _("Authorize buddy?"), buffer, aa, |
2507 _("Authorize"), authorize_and_add_cb, | 2507 _("Authorize"), authorize_and_add_cb, |
2508 _("Deny"), deny_no_add_cb, | 2508 _("Deny"), deny_no_add_cb, |
2509 NULL); | 2509 NULL); |
2510 } else { | 2510 } else { |
2511 alert = gaim_gtk_make_mini_dialog(gc, GAIM_STOCK_DIALOG_QUESTION, | 2511 alert = gaim_gtk_make_mini_dialog(gc, PIDGIN_STOCK_DIALOG_QUESTION, |
2512 _("Authorize buddy?"), buffer, user_data, | 2512 _("Authorize buddy?"), buffer, user_data, |
2513 _("Authorize"), auth_cb, | 2513 _("Authorize"), auth_cb, |
2514 _("Deny"), deny_cb, | 2514 _("Deny"), deny_cb, |
2515 NULL); | 2515 NULL); |
2516 } | 2516 } |