Mercurial > pidgin.yaz
diff 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 |
line wrap: on
line diff
--- a/pidgin/gtkaccount.c Sat Jan 27 17:46:52 2007 +0000 +++ b/pidgin/gtkaccount.c Sun Jan 28 01:24:15 2007 +0000 @@ -1563,7 +1563,7 @@ g_free(pulse_data); } - pixbuf = gaim_gtk_create_prpl_icon(account, 0.5); + pixbuf = gaim_gtk_create_prpl_icon(account, PIDGIN_PRPL_ICON_MEDIUM); if ((pixbuf != NULL) && gaim_account_is_disconnected(account)) gdk_pixbuf_saturate_and_pixelate(pixbuf, pixbuf, 0.0, FALSE); @@ -1942,7 +1942,7 @@ gtk_tree_view_insert_column(GTK_TREE_VIEW(treeview), column, -1); gtk_tree_view_column_set_resizable(column, TRUE); - /* Status Icon */ + /* Buddy Icon */ renderer = gtk_cell_renderer_pixbuf_new(); gtk_tree_view_column_pack_start(column, renderer, FALSE); gtk_tree_view_column_add_attribute(column, renderer, @@ -1982,7 +1982,7 @@ GdkPixbuf *statusicon_pixbuf; GdkPixbuf *statusicon_pixbuf_scaled; - pixbuf = gaim_gtk_create_prpl_icon(account, 0.5); + pixbuf = gaim_gtk_create_prpl_icon(account, PIDGIN_PRPL_ICON_MEDIUM); if ((pixbuf != NULL) && gaim_account_is_disconnected(account)) gdk_pixbuf_saturate_and_pixelate(pixbuf, pixbuf, 0.0, FALSE); @@ -1996,7 +1996,7 @@ statusicon_pixbuf = NULL; if (statusicon_pixbuf) { - statusicon_pixbuf_scaled = gdk_pixbuf_scale_simple(statusicon_pixbuf, 16, 16, GDK_INTERP_HYPER); + statusicon_pixbuf_scaled = gdk_pixbuf_scale_simple(statusicon_pixbuf, 22, 22, GDK_INTERP_HYPER); } else { statusicon_pixbuf_scaled = NULL; } @@ -2130,11 +2130,11 @@ label = gtk_label_new(NULL); /* Translators: Please maintain the use of -> or <- to represent the menu heirarchy */ pretty = gaim_gtk_make_pretty_arrows(_( - "<span size='larger' weight='bold'>Welcome to Gaim!</span>\n\n" + "<span size='larger' weight='bold'>Welcome to " PIDGIN_NAME "!</span>\n\n" - "You have no IM accounts configured. To start connecting with Gaim " + "You have no IM accounts configured. To start connecting with " PIDGIN_NAME " " "press the <b>Add</b> button below and configure your first " - "account. If you want Gaim to connect to multiple IM accounts, " + "account. If you want " PIDGIN_NAME " to connect to multiple IM accounts, " "press <b>Add</b> again to configure them all.\n\n" "You can come back to this window to add, edit, or remove " @@ -2402,7 +2402,7 @@ gc = gaim_account_get_connection(account); buffer = make_info(account, gc, remote_user, id, alias, msg); - alert = gaim_gtk_make_mini_dialog(gc, GAIM_STOCK_DIALOG_INFO, buffer, + alert = gaim_gtk_make_mini_dialog(gc, PIDGIN_STOCK_DIALOG_INFO, buffer, NULL, NULL, _("Close"), NULL, NULL); gaim_gtk_blist_add_alert(alert); @@ -2427,7 +2427,7 @@ data->alias = g_strdup(alias); buffer = make_info(account, gc, remote_user, id, alias, msg); - alert = gaim_gtk_make_mini_dialog(gc, GAIM_STOCK_DIALOG_QUESTION, + alert = gaim_gtk_make_mini_dialog(gc, PIDGIN_STOCK_DIALOG_QUESTION, _("Add buddy to your list?"), buffer, data, _("Add"), G_CALLBACK(add_user_cb), _("Cancel"), G_CALLBACK(free_add_user_data), NULL); @@ -2502,13 +2502,13 @@ aa->username = g_strdup(remote_user); aa->alias = g_strdup(alias); aa->account = account; - alert = gaim_gtk_make_mini_dialog(gc, GAIM_STOCK_DIALOG_QUESTION, + alert = gaim_gtk_make_mini_dialog(gc, PIDGIN_STOCK_DIALOG_QUESTION, _("Authorize buddy?"), buffer, aa, _("Authorize"), authorize_and_add_cb, _("Deny"), deny_no_add_cb, NULL); } else { - alert = gaim_gtk_make_mini_dialog(gc, GAIM_STOCK_DIALOG_QUESTION, + alert = gaim_gtk_make_mini_dialog(gc, PIDGIN_STOCK_DIALOG_QUESTION, _("Authorize buddy?"), buffer, user_data, _("Authorize"), auth_cb, _("Deny"), deny_cb,