Mercurial > pidgin
changeset 19340:9dc79e0a8d6c
merge of '671cfe949215447db0da7081a7e1501693ab4f98'
and 'a93e1609456fb485cd9a26a1f6f6eefdbc692055'
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Thu, 23 Aug 2007 05:56:29 +0000 |
| parents | 1cb5f84cb644 (diff) fda2d2d99850 (current diff) |
| children | 7df6301c28ed |
| files | |
| diffstat | 2 files changed, 8 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkconv.c Thu Aug 23 05:55:57 2007 +0000 +++ b/pidgin/gtkconv.c Thu Aug 23 05:56:29 2007 +0000 @@ -7805,25 +7805,20 @@ if (e->button == 3) { /* Right click was pressed. Popup the Send To menu. */ GtkWidget *menu = gtk_menu_new(), *sub; + gboolean populated = populate_menu_with_options(menu, gtkconv, TRUE); sub = gtk_menu_item_get_submenu(GTK_MENU_ITEM(gtkconv->win->menu.send_to)); - if (populate_menu_with_options(menu, gtkconv, TRUE)) - pidgin_separator(menu); - else if (!sub || - !GTK_WIDGET_IS_SENSITIVE(gtkconv->win->menu.send_to)) { - gtk_widget_destroy(menu); - return FALSE; - } else { - menu = sub; - sub = NULL; - } - - if (sub) { + if (sub && GTK_WIDGET_IS_SENSITIVE(gtkconv->win->menu.send_to)) { GtkWidget *item = gtk_menu_item_new_with_mnemonic(_("_Send To")); + if (populated) + pidgin_separator(menu); gtk_menu_shell_append(GTK_MENU_SHELL(menu), item); gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), sub); gtk_widget_show(item); gtk_widget_show_all(sub); + } else if (!populated) { + gtk_widget_destroy(menu); + return FALSE; } gtk_widget_show_all(menu);
--- a/pidgin/gtkdialogs.c Thu Aug 23 05:55:57 2007 +0000 +++ b/pidgin/gtkdialogs.c Thu Aug 23 05:56:29 2007 +0000 @@ -301,7 +301,7 @@ context = gtk_widget_get_pango_context(widget); layout = pango_layout_new(context); - markup = g_strdup_printf("<span foreground=\"#5c3566\">%s</span>", VERSION); + markup = g_strdup_printf("<span foreground=\"#FFFFFF\">%s</span>", VERSION); pango_layout_set_font_description(layout, style->font_desc); pango_layout_set_markup(layout, markup, strlen(markup)); g_free(markup);