Reply

386	^[380]	None
Re[2]:Patch for GNOME2 IP Messenger Yuan Qingyun(09/8/14 18:46) - + error_out: if (enc_pass != NULL) g_free(enc_pass); @@ -3829,37 +3829,37 @@ g_assert(editable != NULL); - window = + window = GTK_WINDOW(lookup_widget(GTK_WIDGET(editable), "passwdWindow")); g_assert(window != NULL); /* * åâ¥òåâ¡×å⥯å⥡åã¦å¥èíí¥¤êÀ— */ - current_passwd = - GTK_ENTRY(lookup_widget(GTK_WIDGET(window), + current_passwd = + GTK_ENTRY(lookup_widget(GTK_WIDGET(window), "currentPassWordEntry")); g_assert(current_passwd != NULL); - new_passwd = - GTK_ENTRY(lookup_widget(GTK_WIDGET(window), + new_passwd = + GTK_ENTRY(lookup_widget(GTK_WIDGET(window), "passwdEntry1")); g_assert(new_passwd != NULL); - confirmed_passwd = - GTK_ENTRY(lookup_widget(GTK_WIDGET(window), + confirmed_passwd = + GTK_ENTRY(lookup_widget(GTK_WIDGET(window), "passwdEntry2")); g_assert(confirmed_passwd != NULL); - ok_button = - GTK_BUTTON(lookup_widget(GTK_WIDGET(window), + ok_button = + GTK_BUTTON(lookup_widget(GTK_WIDGET(window), "passWordOKBtn")); current_passwd_string = (char *)gtk_entry_get_text(GTK_ENTRY(current_passwd)); g_assert(current_passwd_string != NULL); - new_passwd_string = + new_passwd_string = (char *)gtk_entry_get_text(GTK_ENTRY(new_passwd)); g_assert(new_passwd_string != NULL); @@ -3867,7 +3867,7 @@ (char *)gtk_entry_get_text(GTK_ENTRY(confirmed_passwd)); g_assert(confirm_passwd_string != NULL); - priv = + priv = (ipmsg_private_data_t *)lookup_widget(GTK_WIDGET(window),"passWordType"); g_assert(priv != NULL); @@ -3892,21 +3892,21 @@ } rc = -EPERM; - /* + /* * é塦éêÖå¡÷åáÞå¥ñå⥱åã¥Ãå㥷åã²å¡ì躀ï票åáÎ墨åá¨å¢¨, åá¶å¢¦, í糧éü¥£åãÂ夻åã¥Ãå㥷åã²å¡ìëü¥§ðª¥åê°Ôå¡ëå᥻åáÞ墱, * í糧éü¥£åá¥çåãÂ夻åã¥Ãå㥷åã²å£ò쯡×³åᥩé塦éêÖå¡÷åá¥òåá¨å¢¡ê¢¥¨éð°å¢±, * OKåãØå¤Áå㥦åâÄè×ééꥱåᥩåáÒå£ë. - * å⥵åâ¥åå㡦å㥧åã¬å¤¥èº´å¢±, åá¤å¢Àåâ´ç¡¦¥¹å᥻åáÎå¡ïåᥧåá¨ç¥çÞê¡×ªå¢¢åáŒ, + * å⥵åâ¥åå㡦å㥧åã¬å¤¥èº´å¢±, åá¤å¢Àåâ´ç¡¦¥¹å᥻åáÎå¡ïåᥧåá¨ç¥çÞê¡×ªå¢¢åáŒ, * éèÚ祽¦ê€ªå¢­åá¥ÃåáÆ墰å᥵åá¬å¡ìåâ°å¡äåᥣéè¡¢ëö¥ååáÎ墡. */ if ( (g_utf8_collate(new_passwd_string, confirm_passwd_string) == 0) && - ( (pbkdf2_encoded_passwd_configured(configured_encoded_passwd)) || + ( (pbkdf2_encoded_passwd_configured(configured_encoded_passwd)) || (pbkdf2_verify(current_passwd_string, configured_encoded_passwd) == 0) ) ) rc = 0; if (rc == 0) gtk_widget_set_sensitive(GTK_WIDGET(ok_button), TRUE); - else + else gtk_widget_set_sensitive(GTK_WIDGET(ok_button), FALSE); return rc; @@ -3966,11 +3966,11 @@ dbg_out("here\n"); - enclose_toggle = + enclose_toggle = GTK_TOGGLE_BUTTON(lookup_widget(GTK_WIDGET(togglebutton),"encloseCheckBtn")); g_assert(enclose_toggle != NULL); - lock_toggle = + lock_toggle = GTK_TOGGLE_BUTTON(lookup_widget(GTK_WIDGET(togglebutton), "lockChkBtn")); g_assert(lock_toggle != NULL); @@ -4002,3 +4002,39 @@ } +//add to fix unselected bugs when the tree refresh +gboolean +view_selection_func (GtkTreeSelection *selection, + GtkTreeModel *model, + GtkTreePath *path, + gboolean path_currently_selected, + gpointer userdata) +{ + + + GtkTreeIter iter; + + if (gtk_tree_model_get_iter(model, &iter, path)) + { + gchar *name = NULL; + + gtk_tree_model_get(model, &iter, USER_VIEW_NICKNAME_ID, &name, -1); +// +// if (!path_currently_selected) +// { +// g_print ("%s is going to be selected.\n", name); +// } +// else +// { +// g_print ("%s is going to be unselected.\n", name); +// } + + selected_user_nick_changed((GtkWidget*)userdata, name, path_currently_selected); + + g_free(name); + } + + return TRUE; /* allow selection state to change */ + +} + diff -Nur g2ipmsg-0.9.6.ori/src/callbacks.h g2ipmsg-0.9.6/src/callbacks.h --- g2ipmsg-0.9.6.ori/src/callbacks.h 2008-10-27 02:15:38.000000000 +0800 +++ g2ipmsg-0.9.6/src/callbacks.h 2009-08-05 09:44:53.000000000 +0800 @@ -1053,3 +1053,12 @@ void on_enableLogToggle_toggled (GtkToggleButton *togglebutton, gpointer user_data); + +//add to fix unselected bugs when the tree refresh +gboolean + view_selection_func (GtkTreeSelection *selection, + GtkTreeModel *model, + GtkTreePath *path, + gboolean path_currently_selected, + gpointer userdata); + diff -Nur g2ipmsg-0.9.6.ori/src/interface.c g2ipmsg-0.9.6/src/interface.c --- g2ipmsg-0.9.6.ori/src/interface.c 2008-10-27 02:15:38.000000000 +0800 +++ g2ipmsg-0.9.6/src/interface.c 2009-08-05 09:44:50.000000000 +0800 @@ -232,7 +232,7 @@ vpaned1 = gtk_vpaned_new (); gtk_widget_show (vpaned1); gtk_box_pack_start (GTK_BOX (vbox1), vpaned1, TRUE, TRUE, 0); - gtk_paned_set_position (GTK_PANED (vpaned1), 134); + gtk_paned_set_position (GTK_PANED (vpaned1), 480); hbox21 = gtk_hbox_new (FALSE, 0); gtk_widget_show (hbox21); @@ -1537,7 +1537,7 @@ scrolledwindow6 = gtk_scrolled_window_new (NULL, NULL); gtk_widget_show (scrolledwindow6); gtk_box_pack_start (GTK_BOX (vbox5), scrolledwindow6, TRUE, TRUE, 0); - gtk_widget_set_size_request (scrolledwindow6, 340, 200); + gtk_widget_set_size_request (scrolledwindow6, 300, 200); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow6), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolledwindow6), GTK_SHADOW_IN);

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