Reply

387	^[380]	None
Re[2]:Patch for GNOME2 IP Messenger Yuan Qingyun(09/8/14 18:46) diff -Nur g2ipmsg-0.9.6.ori/src/uicommon.c g2ipmsg-0.9.6/src/uicommon.c --- g2ipmsg-0.9.6.ori/src/uicommon.c 2008-10-27 02:15:38.000000000 +0800 +++ g2ipmsg-0.9.6/src/uicommon.c 2009-08-05 09:44:50.000000000 +0800 @@ -42,7 +42,7 @@ GtkTreeModel *model; model = gtk_tree_view_get_model(view); - + if (!model) return -EINVAL; @@ -112,7 +112,7 @@ GList *groups,*node; - menu=gtk_menu_new(); + menu=gtk_menu_new(); groups=get_group_list(); @@ -162,7 +162,7 @@ model=gtk_tree_view_get_model(GTK_TREE_VIEW(view)); valid=gtk_tree_model_get_iter_first (model,&iter); while(valid){ - gtk_tree_model_get (model, &iter, + gtk_tree_model_get (model, &iter, USER_VIEW_GROUP_ID, &groupname, -1); if (!strcmp(groupname,text)) { @@ -189,7 +189,7 @@ menu=create_userlistPopUpMenu (); selectGroupMenu=lookup_widget(menu,"groupselection"); g_assert(selectGroupMenu); - gtk_menu_item_set_submenu (GTK_MENU_ITEM (selectGroupMenu),create_group_menu(window)); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (selectGroupMenu),create_group_menu(window)); GLADE_HOOKUP_OBJECT_NO_REF (menu, window, "messageWindow"); return menu; @@ -204,7 +204,7 @@ case 3: gtk_menu_popup(GTK_MENU(internal_create_view_config_menu(widget)), NULL, NULL, NULL, NULL, event->button, event->time); - + default: /* main menu */ return FALSE; break; @@ -252,13 +252,13 @@ int rc; gchar *ipaddr=NULL; - if ( (prio < USERLIST_PRIO_MIN) || - (prio > USERLIST_PRIO_MAX) ) + if ( (prio < USERLIST_PRIO_MIN) || + (prio > USERLIST_PRIO_MAX) ) return; dbg_out("Here: prio %d\n",prio); - - gtk_tree_model_get(model, iter, + + gtk_tree_model_get(model, iter, USER_VIEW_IPADDR_ID, &ipaddr, -1); @@ -270,7 +270,7 @@ } void -setup_message_tree_view(GtkWidget *view) { +setup_message_tree_view(GtkWidget *view, GtkWidget *message_windows) { GtkTreeViewColumn *col; GtkCellRenderer *renderer; guint state; @@ -281,13 +281,13 @@ state=hostinfo_refer_header_state(); /* - * �⥽�⡢��妭��갚 + * �⥽�⡢��妭��갚 */ /* --- Column #1 --- */ col=create_user_view_column(USER_VIEW_NICKNAME_ID, _("User"), G_CALLBACK(on_messageUserTree_user_clicked)); view_cols[USER_VIEW_NICKNAME_ID]=col; g_assert(GET_ID(col)==USER_VIEW_NICKNAME_ID); - + /* --- Column #2 --- */ col=create_user_view_column(USER_VIEW_GROUP_ID, _("Group"), G_CALLBACK(on_messageUserTree_group_clicked)); view_cols[USER_VIEW_GROUP_ID]=col; @@ -345,6 +345,11 @@ GTK_SIGNAL_FUNC (on_message_view_event_button_press_event), NULL); + GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(view)); + + gtk_tree_selection_set_select_function(selection, view_selection_func, (gpointer)message_windows, NULL); + + } void @@ -459,13 +464,13 @@ ipmsg_send_br_entry(udp_con,0); } -void +void ipmsg_wait_ms(const int wait_ms){ GTimer *wait_timer = NULL; gulong elapsed = 0; gint remains_ms = 0; - wait_timer = g_timer_new(); + wait_timer = g_timer_new(); g_assert(wait_timer != NULL); for(remains_ms = wait_ms;remains_ms > 0; --remains_ms) { @@ -493,7 +498,7 @@ } void userview_set_view_priority_without_update(GtkTreeModel *model, - GtkTreePath *path, + GtkTreePath *path, GtkTreeIter *iter, int prio){ /* path ���NULL�ᥩ�ᥧ���������ᥣ�ᥩ쵥���(on_set_all_as_default_activate ��骩) */ @@ -516,7 +521,7 @@ view=lookup_widget(GTK_WIDGET(window),"messageUserTree"); cols=gtk_tree_view_get_columns(GTK_TREE_VIEW(view)); - + for(node=g_list_first(cols),count=0;node;node=g_list_next (node),++count) { g_assert(node->data); col=node->data; @@ -526,7 +531,7 @@ return 0; } -void +void update_rsa_encryption_button_state(GtkToggleButton *togglebutton) { GtkWindow *window = NULL; GtkCheckButton *encryptionCheckBtn = NULL; @@ -534,11 +539,11 @@ dbg_out("here\n"); - window = + window = GTK_WINDOW(lookup_widget(GTK_WIDGET(togglebutton), "securityConfig")); g_assert(window != NULL); - encryptionCheckBtn = + encryptionCheckBtn = GTK_CHECK_BUTTON(lookup_widget(GTK_WIDGET(window), "RSAKeyEncryptionCBtn")); g_assert(encryptionCheckBtn != NULL); @@ -551,7 +556,7 @@ */ #if defined(USE_OPENSSL) if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(encryptionCheckBtn))) - gtk_widget_set_sensitive(GTK_WIDGET(pubkeyPWDBtn), TRUE); + gtk_widget_set_sensitive(GTK_WIDGET(pubkeyPWDBtn), TRUE); else gtk_widget_set_sensitive(GTK_WIDGET(pubkeyPWDBtn), FALSE); #else @@ -560,7 +565,7 @@ return; }

[ Return IP Messenger / All view / Newest title / New post / Admin ]