Skip to content
Snippets Groups Projects
Commit c69ad0db authored by Yann Leboulanger's avatar Yann Leboulanger
Browse files

update debian folder for 0.15.3

parent 53a18d8c
No related branches found
Tags 1.7.1
No related merge requests found
gajim (0.15.3-1) unstable; urgency=low
* New upstream release
* Switch to 3.0 (quilt) source format.
-- Yann Leboulanger <yann@leboulanger.org> Sun, 17 Mar 2013 18:32:12 +0200
gajim (0.15.1-4) unstable; urgency=low
* apply patches using dpatch in debian/rules
......
#! /bin/sh /usr/share/dpatch/dpatch-run
## 00_connection_handlers.diff by <asterix@lagaule.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: fix variable name
#
# Description: fix variable name
# Author: Yann Leboulanger <asterix@lagaule.org>
# Last-Update: 2012-10-28
@DPATCH@
Index: src/common/connection_handlers.py
===================================================================
--- a/src/common/connection_handlers.py
+++ b/src/common/connection_handlers.py
@@ -1993,7 +1993,7 @@
def _StreamCB(self, con, iq_obj):
log.debug('StreamCB')
gajim.nec.push_incoming_event(StreamReceivedEvent(None,
- conn=self, stanza=obj))
+ conn=self, stanza=iq_obj))
def _register_handlers(self, con, con_type):
# try to find another way to register handlers in each class
00_connection_handlers.diff
01_accel_group.diff
#! /bin/sh /usr/share/dpatch/dpatch-run
## 02_connection_handlers.dpatch by <asterix@asterix.lagaule.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: fix using accel group
#
# Description: fix using accel group
# Author: Yann Leboulanger <asterix@lagaule.org>
# Origin: upstream,http://hg.gajim.org/gajim/rev/fdd7c9b81c1b
# Last-Update: 2012-10-28
@DPATCH@
--- a/src/message_window.py
+++ b/src/message_window.py
@@ -352,6 +352,7 @@
if modifier & gtk.gdk.CONTROL_MASK:
if keyval == gtk.keysyms.h: # CTRL + h
control._on_history_menuitem_activate()
+ return True
elif control.type_id == message_control.TYPE_CHAT and \
keyval == gtk.keysyms.f: # CTRL + f
# CTRL + f moves cursor one char forward when user uses Emacs
@@ -359,28 +360,35 @@
if not gtk.settings_get_default().get_property(
'gtk-key-theme-name') == 'Emacs':
control._on_send_file_menuitem_activate(None)
+ return True
elif control.type_id == message_control.TYPE_CHAT and \
keyval == gtk.keysyms.g: # CTRL + g
control._on_convert_to_gc_menuitem_activate(None)
+ return True
elif control.type_id in (message_control.TYPE_CHAT,
message_control.TYPE_PM) and keyval == gtk.keysyms.i: # CTRL + i
control._on_contact_information_menuitem_activate(None)
elif keyval == gtk.keysyms.l or keyval == gtk.keysyms.L: # CTRL + l|L
control.conv_textview.clear()
+ return True
elif keyval == gtk.keysyms.u: # CTRL + u: emacs style clear line
control.clear(control.msg_textview)
+ return True
elif control.type_id == message_control.TYPE_GC and \
keyval == gtk.keysyms.b: # CTRL + b
control._on_bookmark_room_menuitem_activate(None)
+ return True
# Tab switch bindings
elif keyval == gtk.keysyms.F4: # CTRL + F4
self.remove_tab(control, self.CLOSE_CTRL_KEY)
+ return True
elif keyval == gtk.keysyms.w: # CTRL + w
# CTRL + w removes latest word before sursor when User uses emacs
# theme
if not gtk.settings_get_default().get_property(
'gtk-key-theme-name') == 'Emacs':
self.remove_tab(control, self.CLOSE_CTRL_KEY)
+ return True
elif keyval in (gtk.keysyms.Page_Up, gtk.keysyms.Page_Down):
# CTRL + PageUp | PageDown
# Create event and send it to notebook
@@ -390,12 +398,14 @@
event.state = gtk.gdk.CONTROL_MASK
event.keyval = int(keyval)
self.notebook.emit('key_press_event', event)
+ return True
if modifier & gtk.gdk.SHIFT_MASK:
# CTRL + SHIFT
if control.type_id == message_control.TYPE_GC and \
keyval == gtk.keysyms.n: # CTRL + SHIFT + n
control._on_change_nick_menuitem_activate(None)
+ return True
# MOD1 (ALT) mask
elif modifier & gtk.gdk.MOD1_MASK:
# Tab switch bindings
@@ -404,26 +414,34 @@
if new >= self.notebook.get_n_pages():
new = 0
self.notebook.set_current_page(new)
+ return True
elif keyval == gtk.keysyms.Left: # ALT + LEFT
new = self.notebook.get_current_page() - 1
if new < 0:
new = self.notebook.get_n_pages() - 1
self.notebook.set_current_page(new)
+ return True
elif chr(keyval) in st: # ALT + 1,2,3..
self.notebook.set_current_page(st.index(chr(keyval)))
+ return True
elif keyval == gtk.keysyms.c: # ALT + C toggles chat buttons
control.chat_buttons_set_visible(not control.hide_chat_buttons)
+ return True
elif keyval == gtk.keysyms.m: # ALT + M show emoticons menu
control.show_emoticons_menu()
+ return True
elif keyval == gtk.keysyms.d: # ALT + D show actions menu
control.on_actions_button_clicked(control.actions_button)
+ return True
elif control.type_id == message_control.TYPE_GC and \
keyval == gtk.keysyms.t: # ALT + t
control._on_change_subject_menuitem_activate(None)
+ return True
# Close tab bindings
elif keyval == gtk.keysyms.Escape and \
gajim.config.get('escape_key_closes'): # Escape
self.remove_tab(control, self.CLOSE_ESC)
+ return True
def _on_close_button_clicked(self, button, control):
"""
#!/usr/bin/make -f
include /usr/share/dpatch/dpatch.make
%:
dh $@ --with python2
build: build-stamp
build-stamp: patch-stamp
dh build
touch $@
clean: unpatch
dh clean
# test target is broken
override_dh_auto_test:
......
3.0 (quilt)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment