Mercurial > pidgin.yaz

comparison pidgin/gtkconv.c @ 19291:c003aa584909

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove truncation until we can do it smarter
author Sean Egan <seanegan@gmail.com>
date Thu, 16 Aug 2007 22:18:11 +0000
parents 20c2c5a68aee
children 758b71dcd354
comparison
equal deleted inserted replaced
19290:20c2c5a68aee 19291:c003aa584909
6277 6277
6278 if ((fields & PIDGIN_CONV_COLORIZE_TITLE) || 6278 if ((fields & PIDGIN_CONV_COLORIZE_TITLE) ||
6279 (fields & PIDGIN_CONV_SET_TITLE) || 6279 (fields & PIDGIN_CONV_SET_TITLE) ||
6280 (fields & PIDGIN_CONV_TOPIC)) 6280 (fields & PIDGIN_CONV_TOPIC))
6281 { 6281 {
6282 char *title, *truncate = NULL, truncchar = '\0'; 6282 char *title;
6283 PurpleConvIm *im = NULL; 6283 PurpleConvIm *im = NULL;
6284 PurpleAccount *account = purple_conversation_get_account(conv); 6284 PurpleAccount *account = purple_conversation_get_account(conv);
6285 PurpleBuddy *buddy = NULL; 6285 PurpleBuddy *buddy = NULL;
6286 PurplePresence *p = NULL; 6286 PurplePresence *p = NULL;
6287 char *markup = NULL; 6287 char *markup = NULL;
6297 ((purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT) 6297 ((purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT)
6298 && purple_conv_chat_has_left(PURPLE_CONV_CHAT(conv)))) 6298 && purple_conv_chat_has_left(PURPLE_CONV_CHAT(conv))))
6299 title = g_strdup_printf("(%s)", purple_conversation_get_title(conv)); 6299 title = g_strdup_printf("(%s)", purple_conversation_get_title(conv));
6300 else 6300 else
6301 title = g_strdup(purple_conversation_get_title(conv)); 6301 title = g_strdup(purple_conversation_get_title(conv));
6302
6303 if (((truncate = strchr(title, ' ')) && strcmp(title, conv->name)) ||
6304 (truncate = strchr(title, '@'))) {
6305 truncchar = *truncate;
6306 *truncate = '\0';
6307 }
6308 6302
6309 if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM) { 6303 if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM) {
6310 buddy = purple_find_buddy(account, conv->name); 6304 buddy = purple_find_buddy(account, conv->name);
6311 if (buddy) { 6305 if (buddy) {
6312 p = purple_buddy_get_presence(buddy); 6306 p = purple_buddy_get_presence(buddy);
6378 g_free(label); 6372 g_free(label);
6379 } 6373 }
6380 else 6374 else
6381 gtk_label_set_text(GTK_LABEL(gtkconv->tab_label), title); 6375 gtk_label_set_text(GTK_LABEL(gtkconv->tab_label), title);
6382 6376
6383 if (truncate)
6384 *truncate = truncchar;
6385
6386 if (pidgin_conv_window_is_active_conversation(conv)) 6377 if (pidgin_conv_window_is_active_conversation(conv))
6387 update_typing_icon(gtkconv); 6378 update_typing_icon(gtkconv);
6388 6379
6389 gtk_label_set_text(GTK_LABEL(gtkconv->menu_label), title); 6380 gtk_label_set_text(GTK_LABEL(gtkconv->menu_label), title);
6390 if (pidgin_conv_window_is_active_conversation(conv)) 6381 if (pidgin_conv_window_is_active_conversation(conv))
8676 #endif 8667 #endif
8677 8668
8678 /* Status icon. */ 8669 /* Status icon. */
8679 gtkconv->icon = gtk_image_new(); 8670 gtkconv->icon = gtk_image_new();
8680 gtkconv->menu_icon = gtk_image_new(); 8671 gtkconv->menu_icon = gtk_image_new();
8672 gtk_widget_show(gtkconv->icon);
8681 update_tab_icon(conv); 8673 update_tab_icon(conv);
8682 8674
8683 /* Tab label. */ 8675 /* Tab label. */
8684 gtkconv->tab_label = gtk_label_new(tmp_lab = purple_conversation_get_title(conv)); 8676 gtkconv->tab_label = gtk_label_new(tmp_lab = purple_conversation_get_title(conv));
8685 8677
8736 angle = 270; 8728 angle = 270;
8737 8729
8738 #if GTK_CHECK_VERSION(2,6,0) 8730 #if GTK_CHECK_VERSION(2,6,0)
8739 if (!angle && pidgin_conv_window_get_gtkconv_count(win) > 1) { 8731 if (!angle && pidgin_conv_window_get_gtkconv_count(win) > 1) {
8740 g_object_set(G_OBJECT(gtkconv->tab_label), "ellipsize", PANGO_ELLIPSIZE_END, NULL); 8732 g_object_set(G_OBJECT(gtkconv->tab_label), "ellipsize", PANGO_ELLIPSIZE_END, NULL);
8741 gtk_label_set_width_chars(GTK_LABEL(gtkconv->tab_label), 6); 8733 gtk_label_set_width_chars(GTK_LABEL(gtkconv->tab_label), 4);
8742 } else { 8734 } else {
8743 g_object_set(G_OBJECT(gtkconv->tab_label), "ellipsize", PANGO_ELLIPSIZE_NONE, NULL); 8735 g_object_set(G_OBJECT(gtkconv->tab_label), "ellipsize", PANGO_ELLIPSIZE_NONE, NULL);
8744 gtk_label_set_width_chars(GTK_LABEL(gtkconv->tab_label), -1); 8736 gtk_label_set_width_chars(GTK_LABEL(gtkconv->tab_label), -1);
8745 } 8737 }
8746 8738