From 7f243843a0e8e1481e84adf06fbc5e5e98346f99 Mon Sep 17 00:00:00 2001
From: Daniel <mailtrash@posteo.de>
Date: Mon, 26 Feb 2018 20:00:22 +0100
Subject: [PATCH] [gui_for_me] Fix GUI For Me button

---
 gui_for_me/gui_for_me.png | Bin 818 -> 885 bytes
 gui_for_me/gui_for_me.py  |  20 ++++++++++----------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/gui_for_me/gui_for_me.png b/gui_for_me/gui_for_me.png
index ee4e219e212938e269f62b52d7729e924d96f0b7..9325cb0ebf38b2d5296f1f5391d32f2b9e39b25d 100644
GIT binary patch
literal 885
zcmX|AYe<t}6n<A4bIyt=b)t~{kXbG-dC64pGPk)~yN5DyI<HYMFfr{mUDW0@b<Sbw
ztbZbNwUB`tWT2to1n-96ADMH^shiH3d7-0H2i|l0p7%M=d*D-X*wg@A2o50>kV7N$
zAYMK>*z@3tq)U7VK4lrK41~Tm`yUqiLVaCI<FOE`jX+5L8lgYXlG_ogib2RBLFirw
zLP4^wA#N%{7&(V2$Ob@6Ow8?5gXGMh`k$QT+uPeFlS!-9Zf$LOJf6+XP4Likxm-@C
zlgVVd-EObfyZ6tazk6z8vDjv_rKF@}Wn}@3&*vv4B}t`H0CaYCCMG5-mCFA9ei+x&
z)3d(5ZZ?|-1_lNP2Z0F)p|iBKWU*M**47FN3V>3h(Ewg36v9NK(MYG$$z-xXAOIdv
zwY<DMGBN@%kY~5sfdm9Y35mgA;BYvA2f?5mJcGeVNJxOMFg-3VE;csy{~jQTkB<j=
zR4UbKwW`(X{QP{tgZS?5?)3C@5RjUh3bd7#mGBUd3fCPD2a!kwDiVp5mzS5EoGg>c
z^m=_-S{lfkpP%P)xfBXTBoe_wU^FbB*YdU)g7^uK%}4lLvpZKYUQQ&IV{Sy>4G#|^
zgocM#x3{#sQ&iQ}EbQ!hc6N3*7H!^@Ve|39@x=7;@zMU=hI7?ncdl61H|%yr^9Q+H
z{_1({i@t}|Ap}CT7*i1$sc`pZeq+NNOc8@hMoQl>8WesqT5csm{#Q;8W@h>2Av7I1
z<P1UZtW<)|Q6fqM14|<)7l@K3Rg=oMK3IhPNJ`Y{6>aLyv<O|mXjy}5RX#2olh3(a
z+irg>7U!o{HmJsaqRG}4twy8OwYInEbPtqeMG}sHC*lhEi&KKxnT4FG5(%x5MQ2Z|
zr|+}w(2^_?46eAeWX)<@4H~@~NVul(p*J!nm_@9KTQ?^yh7Lk-RFtvrao?j2XIQAd
z%TV`bXkcjY+0)vZgWt9L^IBxw{W6Ki;_-OgMO<XBzwb~q-s*8F$7SAM9Ykf@`=TG;
l)vCh!njrg8d0?r?w1@E-j;{C=A9?Z*pqy+r`E#bE{x9vmnezYu

delta 806
zcmV+>1KIrb2C@c_8Gi-<001BJ|6u?C00v@9M??VX0QvxMb8+K400009a7bBm000XU
z000XU0RWnu7ytkO2XskIMF-sn5()!0!$hUo0000TX;fHrLvL+uWo~o;00000Lvm$d
zbY)~9cWHEJAV*0}P-HG;2LJ#9mPtfGR5;76lTB!pR}_YybARtQnJ<%>jEP1qrVF*G
z5q}m9DTs}(+D2_RVkKd;ZpIoAe-;rJsS6e9LTMMZ4bDm&?8+YybW?4iK~M%4LN{u`
zsH9FNiD_mWzWMIVy<Iq|A&472a2DtAzMQ}J2y?76os9!u0x4i)Jv|I$for);sx%uf
zbI85GMc!_GxqnRR*O@@gBA=K=z610F9d+-o=KwC&v9CLrQ@KBvNe#WJbZ0ud5BOzv
zC(@bD%B`V$OK;zAPK-@P8n<*$<Pp$XQwyo;22-_Y?bV1FYdL&+)z^<l{qKWN;hZD{
zV7zwd?0i)*Gb?d`;H*QxoUAoWH|c8J$0PtkbYbA<m4CbLKWOeKm35y75Cm%XXUDo!
zJZ4;Ttm>i-mWNMcs%y=3aAeQpv8#W!CC^=MPdX>E^YhX1ZQc35^ApjIQaP4V0M1GL
z#lMkQ&xS(Nyks>VRCN4c??~hCcUxOcRX!TJ)c(QV9ZzC|=|}#J;kFO8mUv6T0BrpK
z3a#@((tlq(V_}P-=hFgPyT%0(0PlIh=ZEvl8T@IbJk9$kT!YdM0B>eyYXuNjvmy?`
zA<kM65o?z%DXXtGKc~BMiiqdJQd#Suq5y_H0HxgIx)ntiqAKl+f=Fx9ScB9)UOgT4
zJj(lfM^yIulIYF5ZEAipH0xIt7nELVfUE!%!hb_2Op*A=l;5;|S!vWDlmpFTzv3pU
z(ORQtZ49FU^;>Si+AFsgZGSM*#8feo@BjvWT=CE7n12?at)+7G%)nn4L|4fhO*CR%
z(LfOKIB;t9?)-$mJv0hnS1yw(2|(HP$)<06jyuQTjFd$<ua*7d)qd1w=lBNrq^^~d
kxgSjGyZ7=;@~-dv9|uAdjW;}#NdN!<07*qoM6N<$f_CU`IRF3v

diff --git a/gui_for_me/gui_for_me.py b/gui_for_me/gui_for_me.py
index 1cd907a..494ff63 100644
--- a/gui_for_me/gui_for_me.py
+++ b/gui_for_me/gui_for_me.py
@@ -6,13 +6,14 @@ from gi.repository import GdkPixbuf
 from gajim.common import app
 from gajim.plugins import GajimPlugin
 from gajim.plugins.helpers import log_calls
+from gajim import gtkgui_helpers
 
 
 class GuiForMe(GajimPlugin):
 
     @log_calls('GuiForMePlugin')
     def init(self):
-        self.description = _('Gui for the \'/me\' command.')
+        self.description = _('Adds a button for the \'/me\' command.')
         self.config_dialog = None  # GuiForMePluginConfigDialog(self)
         self.gui_extension_points = {
             'chat_control_base': (self.connect_with_chat_control,
@@ -57,18 +58,16 @@ class Base(object):
 
     def create_buttons(self):
         # create /me button
-        actions_hbox = self.chat_control.xml.get_object('actions_hbox')
-        self.button = Gtk.Button(label=None, stock=None, use_underline=True)
-        self.button.set_property('relief', Gtk.ReliefStyle.NONE)
+        actions_hbox = self.chat_control.xml.get_object('hbox')
+        self.button = Gtk.Button(label=None, stock=None, use_underline=False)
+        self.button.get_style_context().add_class(
+            'chatcontrol-actionbar-button')
+        self.button.set_relief(Gtk.ReliefStyle.NONE)
         self.button.set_property('can-focus', False)
         img = Gtk.Image()
         img_path = self.plugin.local_file_path('gui_for_me.png')
         pixbuf = GdkPixbuf.Pixbuf.new_from_file(img_path)
-        iconset = Gtk.IconSet(pixbuf=pixbuf)
-        factory = Gtk.IconFactory()
-        factory.add('gui_for_me', iconset)
-        factory.add_default()
-        img.set_from_stock('gui_for_me', Gtk.IconSize.MENU)
+        img.set_from_pixbuf(pixbuf)
         self.button.set_image(img)
         self.button.set_tooltip_text(_('Insert /me to conversation input box,'
             ' at cursor position'))
@@ -84,9 +83,10 @@ class Base(object):
         Insert /me to conversation input box, at cursor position
         """
         message_buffer = self.chat_control.msg_textview.get_buffer()
+        self.chat_control.msg_textview.remove_placeholder()
         message_buffer.insert_at_cursor('/me ')
         self.chat_control.msg_textview.grab_focus()
 
     def disconnect_from_chat_control(self):
-        actions_hbox = self.chat_control.xml.get_object('actions_hbox')
+        actions_hbox = self.chat_control.xml.get_object('hbox')
         actions_hbox.remove(self.button)