qulogic/pidgin

Remove Talkatu from the status editor

8 months ago, Gary Kramlich
f7838d462608
Parents 6d129ecb4b6f
Children bcaffaf9588f
Remove Talkatu from the status editor

Testing Done:
Created a status, modified it a few times, and made sure everything worked right with the message.

Reviewed at https://reviews.imfreedom.org/r/2745/
2 files changed, 13 insertions(+), 19 deletions(-)
  • +6 -4
    pidgin/pidginstatuseditor.c
  • +7 -15
    pidgin/resources/Status/editor.ui
    • --- a/pidgin/pidginstatuseditor.c Fri Oct 27 00:10:57 2023 -0500
    +++ b/pidgin/pidginstatuseditor.c Fri Oct 27 00:25:10 2023 -0500
    @@ -20,8 +20,6 @@
    * along with this program; if not, see <https://www.gnu.org/licenses/>.
    */
    -#include <talkatu/talkatu.h>
    -
    #include "pidginstatuseditor.h"
    #include "pidginstatusprimitivechooser.h"
    @@ -83,7 +81,7 @@
    gtk_editable_set_text(GTK_EDITABLE(editor->title), title);
    chooser = PIDGIN_STATUS_PRIMITIVE_CHOOSER(editor->primitive);
    pidgin_status_primitive_chooser_set_selected(chooser, primitive);
    - talkatu_markup_set_html(TALKATU_BUFFER(editor->buffer), message, -1);
    + gtk_text_buffer_set_text(editor->buffer, message, -1);
    g_object_notify_by_pspec(G_OBJECT(editor), properties[PROP_STATUS]);
    }
    @@ -92,6 +90,8 @@
    pidgin_status_editor_save_status(PidginStatusEditor *editor) {
    PidginStatusPrimitiveChooser *chooser = NULL;
    PurpleStatusPrimitive primitive;
    + GtkTextIter start;
    + GtkTextIter end;
    gchar *message = NULL;
    const gchar *title = NULL;
    @@ -100,7 +100,9 @@
    chooser = PIDGIN_STATUS_PRIMITIVE_CHOOSER(editor->primitive);
    primitive = pidgin_status_primitive_chooser_get_selected(chooser);
    - message = talkatu_markup_get_html(editor->buffer, NULL);
    + gtk_text_buffer_get_start_iter(editor->buffer, &start);
    + gtk_text_buffer_get_end_iter(editor->buffer, &end);
    + message = gtk_text_buffer_get_text(editor->buffer, &start, &end, FALSE);
    if(editor->status == NULL) {
    editor->status = purple_savedstatus_new(title, primitive);
    --- a/pidgin/resources/Status/editor.ui Fri Oct 27 00:10:57 2023 -0500
    +++ b/pidgin/resources/Status/editor.ui Fri Oct 27 00:25:10 2023 -0500
    @@ -18,8 +18,6 @@
    -->
    <interface>
    <requires lib="gtk" version="4.0"/>
    - <requires lib="Talkatu" version="0.2.0"/>
    - <requires lib="pidgin" version="3.0"/>
    <!-- interface-license-type gplv2 -->
    <!-- interface-name Pidgin -->
    <!-- interface-description Internet Messenger -->
    @@ -69,12 +67,14 @@
    </object>
    </child>
    <child>
    - <object class="TalkatuEditor" id="editor">
    + <object class="GtkScrolledWindow">
    <property name="hexpand">1</property>
    - <property name="show-send-button">0</property>
    - <child internal-child="input">
    - <object class="TalkatuInput" id="message">
    - <property name="buffer">buffer</property>
    + <property name="hscrollbar_policy">never</property>
    + <child>
    + <object class="GtkTextView" id="message">
    + <property name="buffer">
    + <object class="GtkTextBuffer" id="buffer"/>
    + </property>
    <property name="hexpand">1</property>
    <property name="width-request">450</property>
    <property name="wrap-mode">word</property>
    @@ -122,12 +122,4 @@
    <action-widget response="1">save</action-widget>
    </action-widgets>
    </template>
    - <object class="TalkatuBuffer" id="buffer">
    - <property name="action-group">
    - <object class="TalkatuActionGroup">
    - <property name="format">html</property>
    - <property name="buffer">buffer</property>
    - </object>
    - </property>
    - </object>
    </interface>