Xpad

Merge lp:~arthurborsboom/xpad/xpad-4.4 into lp:xpad

  1. xpad-4.4
  2. Merge into trunk
Proposed by Arthur Borsboom
Status: Merged
Merged at revision: 700
Proposed branch: lp:~arthurborsboom/xpad/xpad-4.4
Merge into: lp:xpad
Diff against target: 35 lines (+7/-0)
3 files modified
ChangeLog (+1/-0)
NEWS (+3/-0)
src/xpad-pad.c (+3/-0)
To merge this branch: bzr merge lp:~arthurborsboom/xpad/xpad-4.4
Reviewer Review Type Date Requested Status
Arthur Borsboom Approve
Review via email: mp+232792@code.launchpad.net

Description of the change

* Fix: CLI - Can't find signal function address when using CLI parameter -f by Yuan Song (#1332971)

To post a comment you must log in.
Revision history for this message
Arthur Borsboom (arthurborsboom) wrote :

Fixes the issue.
Did not perform regression test.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ChangeLog'
2--- ChangeLog 2014-07-23 11:11:18 +0000
3+++ ChangeLog 2014-08-30 18:39:18 +0000
4@@ -1,6 +1,7 @@
5 Version 4.4
6 * Fix: Preferences - redesign of preferences box to make sure it fits on small screens (#1333636)
7 * Fix: Seg Fault - Seg fault on closing the xpad (#1333727)
8+* Fix: CLI - Can't find signal function address when using CLI parameter -f by Yuan Song (#1332971)
9
10 Version 4.3
11 * New: Systray - ability to hide the tray icon (#890334)
12
13=== modified file 'NEWS'
14--- NEWS 2014-06-25 09:22:02 +0000
15+++ NEWS 2014-08-30 18:39:18 +0000
16@@ -1,3 +1,6 @@
17+Version 4.4
18+*
19+
20 Version 4.3
21 * New: Systray - ability to hide the tray icon
22 * New: Toolbar - ability to add multiple separators
23
24=== modified file 'src/xpad-pad.c'
25--- src/xpad-pad.c 2014-06-20 13:30:08 +0000
26+++ src/xpad-pad.c 2014-08-30 18:39:18 +0000
27@@ -176,6 +176,9 @@
28 {
29 GtkTextBuffer *buffer;
30
31+ xpad_periodic_init ();
32+ xpad_periodic_set_callback ("save-content", (XpadPeriodicFunc) xpad_pad_save_content);
33+
34 pad = xpad_pad_new (group, settings);
35 buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (XPAD_PAD (pad)->priv->textview));
36

Subscribers

People subscribed via source and target branches