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: 708
Proposed branch: lp:~arthurborsboom/xpad/xpad-4.4
Merge into: lp:xpad
Diff against target: 56 lines (+8/-3) (has conflicts)
4 files modified
configure.ac (+1/-1)
src/xpad-app.c (+5/-0)
src/xpad-pad.c (+1/-1)
src/xpad-tray.c (+1/-1)
Text conflict in src/xpad-app.c
To merge this branch: bzr merge lp:~arthurborsboom/xpad/xpad-4.4
Reviewer Review Type Date Requested Status
Arthur Borsboom Pending
Review via email: mp+242562@code.launchpad.net

Description of the change

Prevent 1 compiler error and 2 warnings.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure.ac'
2--- configure.ac 2014-10-02 22:14:44 +0000
3+++ configure.ac 2014-11-22 12:06:42 +0000
4@@ -18,7 +18,7 @@
5 AC_PATH_XTRA
6
7 # Checks for GTK+ 3.0
8-PKG_CHECK_MODULES(GTK, gtk+-3.0 gio-2.0)
9+PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.10 gio-2.0)
10 AM_CONDITIONAL(GTK, test -n "$GTK_LIBS")
11 AC_SUBST(GTK_LIBS)
12 AC_SUBST(GTK_CFLAGS)
13
14=== modified file 'src/xpad-app.c'
15--- src/xpad-app.c 2014-10-02 22:56:15 +0000
16+++ src/xpad-app.c 2014-11-22 12:06:42 +0000
17@@ -714,8 +714,13 @@
18 guint size;
19 ssize_t bytesRead;
20 gboolean connected = FALSE;
21+<<<<<<< TREE
22 ssize_t error = NULL;
23
24+=======
25+ ssize_t error;
26+
27+>>>>>>> MERGE-SOURCE
28 /* create master socket */
29 client_fd = socket (PF_LOCAL, SOCK_STREAM, 0);
30 master.sun_family = AF_LOCAL;
31
32=== modified file 'src/xpad-pad.c'
33--- src/xpad-pad.c 2014-10-02 22:56:15 +0000
34+++ src/xpad-pad.c 2014-11-22 12:06:42 +0000
35@@ -1351,7 +1351,7 @@
36 xpad_pad_save_info (XpadPad *pad)
37 {
38 gboolean follow_font_style, follow_color_style;
39- guint height = NULL;
40+ guint height = 0;
41 GtkStyleContext *style = NULL;
42 PangoFontDescription *font = NULL;
43 GdkRGBA text_color = {0, 0, 0, 0}, back_color = {0, 0, 0, 0};
44
45=== modified file 'src/xpad-tray.c'
46--- src/xpad-tray.c 2014-10-02 22:45:34 +0000
47+++ src/xpad-tray.c 2014-11-22 12:06:42 +0000
48@@ -98,7 +98,7 @@
49 void xpad_tray_dispose (XpadSettings *settings) {
50 if (settings)
51 g_signal_handlers_disconnect_by_func (settings, xpad_tray_toggle, NULL);
52- xpad_tray_close (settings);
53+ xpad_tray_close ();
54 }
55
56 gboolean

Subscribers

People subscribed via source and target branches