Reply

385	^[380]	None
Re[2]:Patch for GNOME2 IP Messenger Yuan Qingyun(09/8/14 18:45) - + free_out: g_free(string); gtk_widget_destroy(top); @@ -2982,7 +2982,7 @@ g_assert(widget); g_assert(data); - dbg_out("here:data %s\n",(char *)data->data); + dbg_out("here:data %s\n",(char *)data->data); on_message_window_drag_data_received(widget,data); } @@ -3011,7 +3011,7 @@ filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); file_entry=lookup_widget(GTK_WIDGET(button),"AttachFilePathEntry"); - gtk_entry_set_text(GTK_ENTRY(file_entry), filename); + gtk_entry_set_text(GTK_ENTRY(file_entry), filename); g_free (filename); } gtk_widget_destroy (dialog); @@ -3028,7 +3028,7 @@ dbg_out("here\n"); parent_window=lookup_widget(GTK_WIDGET(entry),"attachFileEditor"); - filename=(char *)gtk_entry_get_text(entry); + filename=(char *)gtk_entry_get_text(entry); } @@ -3116,7 +3116,7 @@ window=lookup_widget(GTK_WIDGET(button),"messageWindow"); g_assert(window); - + gtk_widget_destroy (window); } @@ -3205,14 +3205,14 @@ hostinfo_set_ipmsg_group_sort_order(FALSE); else hostinfo_set_ipmsg_group_sort_order(TRUE); - + /* * sub sort */ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(viewConfigSecondKeyIPAddrRBtn))) hostinfo_set_ipmsg_sub_sort_id(SORT_TYPE_IPADDR); - else + else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(viewConfigSecondKeyMachineRBtn))) hostinfo_set_ipmsg_sub_sort_id(SORT_TYPE_MACHINE); else @@ -3226,8 +3226,8 @@ dbg_out("New state:%x (%d)\n",state,state); hostinfo_set_header_state(state); - gtk_widget_destroy(GTK_WIDGET(window)); - + gtk_widget_destroy(GTK_WIDGET(window)); + } static int update_prioriy_for_selection(GtkMenuItem *menuitem,int prio){ @@ -3247,7 +3247,7 @@ g_assert(window); view=GTK_TREE_VIEW(lookup_widget(GTK_WIDGET(window),"messageUserTree")); g_assert(view); - + sel = gtk_tree_view_get_selection(view); pathes=gtk_tree_selection_get_selected_rows(sel,&model); @@ -3274,7 +3274,7 @@ cmd_no=(unsigned long)data; - gtk_tree_model_get (model, iter, + gtk_tree_model_get (model, iter, USER_VIEW_IPADDR_ID, &ipaddr, -1); @@ -3353,13 +3353,13 @@ { GtkWidget *window; - if (!menuitem) + if (!menuitem) return; window=lookup_widget(GTK_WIDGET(menuitem),"messageWindow"); g_assert(window); - + update_users_on_message_window(window, TRUE); } @@ -3376,14 +3376,14 @@ gboolean valid; - if (!menuitem) + if (!menuitem) return; window=lookup_widget(GTK_WIDGET(menuitem),"messageWindow"); g_assert(window); view=GTK_TREE_VIEW(lookup_widget(GTK_WIDGET(window),"messageUserTree")); g_assert(view); - + model=gtk_tree_view_get_model(view); valid=gtk_tree_model_get_iter_first (model,&iter); while(valid){ @@ -3471,7 +3471,7 @@ dbg_out("here\n"); window=lookup_widget(GTK_WIDGET(button),"viewConfigWindow"); - + gtk_widget_destroy(GTK_WIDGET(window)); } @@ -3491,7 +3491,7 @@ g_assert(view); g_assert(top); - + sel = gtk_tree_view_get_selection(view); gtk_tree_selection_selected_foreach(sel,do_get_client_info,(gpointer)IPMSG_GETINFO); } @@ -3514,7 +3514,7 @@ g_assert(view); g_assert(top); - + sel = gtk_tree_view_get_selection(view); gtk_tree_selection_selected_foreach(sel,do_get_client_info,(gpointer)IPMSG_GETABSENCEINFO); } @@ -3528,7 +3528,7 @@ window=lookup_widget(GTK_WIDGET(button),"clientInfoWindow"); g_assert(window); - gtk_widget_destroy(GTK_WIDGET(window)); + gtk_widget_destroy(GTK_WIDGET(window)); } @@ -3649,7 +3649,7 @@ apply_crypt_config_window(GTK_WINDOW(window)); - gtk_widget_destroy(GTK_WIDGET(window)); + gtk_widget_destroy(GTK_WIDGET(window)); } @@ -3743,11 +3743,11 @@ new_passwd = GTK_ENTRY(lookup_widget(top, "passwdEntry1")); g_assert(new_passwd != NULL); - new_passwd_string = + new_passwd_string = (char *)gtk_entry_get_text(GTK_ENTRY(new_passwd)); g_assert(new_passwd_string != NULL); - priv = + priv = (ipmsg_private_data_t *)lookup_widget(top, "passWordType"); g_assert(priv != NULL); @@ -3786,7 +3786,7 @@ g_assert_not_reached(); break; }

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