Xpad

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

  1. xpad-4.3
  2. Merge into trunk
Proposed by Arthur Borsboom
Status: Merged
Merged at revision: 681
Proposed branch: lp:~arthurborsboom/xpad/xpad-4.3
Merge into: lp:xpad
Diff against target: 21 lines (+2/-2)
1 file modified
src/xpad-tray.c (+2/-2)
To merge this branch: bzr merge lp:~arthurborsboom/xpad/xpad-4.3
Reviewer Review Type Date Requested Status
Arthur Borsboom Approve
Review via email: mp+223151@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Arthur Borsboom (arthurborsboom) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/xpad-tray.c'
2--- src/xpad-tray.c 2014-06-13 15:50:29 +0000
3+++ src/xpad-tray.c 2014-06-14 10:43:24 +0000
4@@ -39,7 +39,7 @@
5 };
6
7 static void xpad_tray_open (XpadSettings *settings);
8-static void xpad_tray_close ();
9+static void xpad_tray_close (XpadSettings *settings);
10 /* Enable/disable the tray icon */
11 static void xpad_tray_toggle (XpadSettings *settings);
12 /* tray icon left click handler */
13@@ -86,7 +86,7 @@
14 docklet = gtk_status_icon_new_from_icon_name (PACKAGE);
15
16 if (docklet) {
17- g_signal_connect (docklet, "activate", G_CALLBACK (xpad_tray_activate_cb), NULL);
18+ g_signal_connect (docklet, "activate", G_CALLBACK (xpad_tray_activate_cb), settings);
19 g_signal_connect (docklet, "popup-menu", G_CALLBACK (xpad_tray_popup_menu_cb), NULL);
20 }
21 }

Subscribers

People subscribed via source and target branches