Skip to content

Commit

Permalink
Changes related to hipchat migration.
Browse files Browse the repository at this point in the history
  • Loading branch information
geektophe committed Sep 17, 2014
1 parent 228ee25 commit 34af50e
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Xresources
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ XTerm*faceName: DejaVu_Sans_Mono_for_Powerline.otf:normal:pixelsize=12
XTerm*dynamicColors: true
XTerm*utf8: 2
XTerm*eightBitInput: true
XTerm*saveLines: 5120
XTerm*saveLines: 10000
XTerm*scrollTtyKeypress: true
XTerm*scrollTtyOutput: false
XTerm*scrollBar: true
Expand Down
4 changes: 2 additions & 2 deletions Xsession
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ esac
eval $( /usr/bin/dbus-launch --sh-syntax --exit-with-session )

# Starts gnome-keyring-daemon and exports its variables
eval $( /usr/bin/gnome-keyring-daemon --start )
eval $( /usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh)
export GNOME_KEYRING_CONTROL
export SSH_AUTH_SOCK
export GPG_AGENT_INFO
#export GPG_AGENT_INFO

# Starts pulseaudio
/usr/bin/start-pulseaudio-x11
Expand Down
5 changes: 3 additions & 2 deletions rc/im.lua
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ function mcabber_event_hook(kind, arg, jid, msg)
preset = naughty.config.presets.normal
icon = "person"

if string.match(jid, "[email protected]") then
if string.match(jid, "[email protected]") or string.match(jid, "Mon") then
if string.match(txt, "^PROBLEM:?") then
icon = "problem"
txt = string.gsub(txt, "^PROBLEM:? ", "")
Expand All @@ -58,7 +58,8 @@ function mcabber_event_hook(kind, arg, jid, msg)
icon = "notification"
txt = string.gsub(txt, "^ACKNOWLEDGEMENT: ", "")
end
elseif string.match(jid, "conference.dailymotion.com") then
elseif arg == "MUC" then
string.gsub(txt, "^<([^>])>", "<strong>%1</strong>")
icon = "chat"
end

Expand Down

0 comments on commit 34af50e

Please sign in to comment.