Reply

382	^[380]	None
Re[2]:Patch for GNOME2 IP Messenger Yuan Qingyun(09/8/14 18:43) @@ -777,14 +777,14 @@ g_assert(configCitationCheckBtn); configIPV6CheckBtn=lookup_widget(GTK_WIDGET(button),"configIPV6CheckBtn"); g_assert(configIPV6CheckBtn); - + configDialUpCheckBtn=lookup_widget(GTK_WIDGET(button),"configDialUpCheckBtn"); g_assert(configDialUpCheckBtn); configIconifyCheckBtn = lookup_widget(GTK_WIDGET(button), "configIconifyCheckBtn"); g_assert(configIconifyCheckBtn != NULL); - codeset_combobox = + codeset_combobox = GTK_COMBO_BOX(lookup_widget(GTK_WIDGET(button), "configEncodingComboBox")); g_assert(codeset_combobox != NULL); string = gtk_combo_box_get_active_text(GTK_COMBO_BOX(codeset_combobox)); @@ -813,9 +813,9 @@ hostinfo_set_ipmsg_default_popup(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(configNonPopupCheckBtn))); - if (is_sound_system_available()) + if (is_sound_system_available()) hostinfo_set_ipmsg_default_sound(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(configNoSoundCheckBtn))); - + hostinfo_set_ipmsg_default_enclose(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(configEncloseEnableCheckBtn))); hostinfo_set_ipmsg_default_citation(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(configCitationCheckBtn))); @@ -824,7 +824,7 @@ hostinfo_set_ipmsg_dialup_mode(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(configDialUpCheckBtn))); - hostinfo_set_ipmsg_iconify_dialogs(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(configIconifyCheckBtn))); + hostinfo_set_ipmsg_iconify_dialogs(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(configIconifyCheckBtn))); hostinfo_set_ipmsg_enable_log(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(enableLogToggle))); @@ -833,14 +833,14 @@ hostinfo_set_ipmsg_ipaddr_logging(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(logIPAddrToggle))); hostinfo_set_log_locked_message_handling(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(logLockToggle))); - + addr_top = NULL; model = gtk_tree_view_get_model(treeview); valid = gtk_tree_model_get_iter_first (model, &iter); while(valid) { gchar *str_data; - gtk_tree_model_get (model, &iter, + gtk_tree_model_get (model, &iter, 0, &str_data, -1); dbg_out("Addr:%s\n",str_data); @@ -928,8 +928,8 @@ usersVPane = lookup_widget(messageWindow,"vpaned1"); g_assert(usersVPane); - - setup_message_tree_view(userview); + + setup_message_tree_view(userview, messageWindow); gtk_drag_dest_set(userview, GTK_DEST_DEFAULT_ALL, targetentries, 1, GDK_ACTION_COPY|GDK_ACTION_MOVE|GDK_ACTION_LINK); @@ -974,7 +974,7 @@ g_assert(messageWindow); gtk_widget_show (messageWindow); - update_users_on_message_window(messageWindow,FALSE); + update_users_on_message_window(messageWindow,FALSE); } } static void @@ -1024,10 +1024,10 @@ attachment_editor=create_attachFileEditor (); g_assert(attachment_editor); - view=GTK_TREE_VIEW(lookup_widget(attachment_editor,"attachedFilesView")); + view=GTK_TREE_VIEW(lookup_widget(attachment_editor,"attachedFilesView")); g_assert(view); - liststore = gtk_list_store_new(3, + liststore = gtk_list_store_new(3, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING); @@ -1104,7 +1104,7 @@ sel=gtk_tree_view_get_selection(GTK_TREE_VIEW(view)); gtk_tree_selection_set_mode(sel, GTK_SELECTION_SINGLE); - g_signal_connect(sel, "changed", + g_signal_connect(sel, "changed", G_CALLBACK(onAttachFileSelectionChanged), liststore); GTK_WIDGET_SET_FLAGS(attachment_editor,GTK_CAN_FOCUS); @@ -1169,7 +1169,7 @@ if (is_supported_file_type(num_ftype)) { model = gtk_tree_view_get_model(treeview); gtk_list_store_append(GTK_LIST_STORE(model), &newrow); - gtk_list_store_set(GTK_LIST_STORE(model), &newrow, + gtk_list_store_set(GTK_LIST_STORE(model), &newrow, 0, filename, 1, str_size, 2, get_file_type_name(num_ftype), @@ -1281,7 +1281,7 @@ priv=(ipmsg_private_data_t *)lookup_widget(GTK_WIDGET(window),"senderInfo"); g_assert(priv); - sender_info=priv->data; + sender_info=priv->data; g_assert(sender_info->ipaddr); /* FIX ME */ ipmsg_send_release_files(udp_con,sender_info->ipaddr,sender_info->pktno); @@ -1472,15 +1472,15 @@ dbg_out("here\n"); - window = + window = lookup_widget(widget,"messageWindow"); g_assert(window != NULL); - enclose_toggle = + enclose_toggle = GTK_TOGGLE_BUTTON(lookup_widget(widget,"encloseCheckBtn")); g_assert(enclose_toggle != NULL); - lock_toggle = + lock_toggle = GTK_TOGGLE_BUTTON(lookup_widget(widget, "lockChkBtn")); g_assert(lock_toggle != NULL); @@ -1490,7 +1490,7 @@ textview = lookup_widget(widget, "textview1"); g_assert(textview != NULL); - if (hostinfo_refer_ipmsg_default_enclose()) + if (hostinfo_refer_ipmsg_default_enclose()) gtk_toggle_button_set_active(enclose_toggle, TRUE); else gtk_toggle_button_set_active(enclose_toggle, FALSE); @@ -1565,7 +1565,7 @@ while(valid) { gchar *tree_ipaddr; - gtk_tree_model_get (model, &iter, + gtk_tree_model_get (model, &iter, USER_VIEW_IPADDR_ID, &tree_ipaddr, -1); dbg_out("Addr:%s\n",tree_ipaddr); @@ -1576,7 +1576,7 @@ g_free(tree_ipaddr); valid = gtk_tree_model_iter_next (model, &iter); } - + }

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