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: 683
Proposed branch: lp:~arthurborsboom/xpad/xpad-4.3
Merge into: lp:xpad
Diff against target: 66 lines (+7/-5)
5 files modified
src/xpad-app.c (+1/-1)
src/xpad-pad.c (+1/-1)
src/xpad-preferences.c (+2/-1)
src/xpad-settings.c (+1/-1)
src/xpad-text-view.c (+2/-1)
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+223157@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-app.c'
2--- src/xpad-app.c 2014-06-13 15:50:29 +0000
3+++ src/xpad-app.c 2014-06-14 17:23:16 +0000
4@@ -258,7 +258,7 @@
5 g_object_unref (xpad_global_settings);
6 xpad_global_settings = NULL; /* This is needed due to the asynchronous finalizing process. */
7
8- /* Free the theme reference. Unfortunately GTK3 leaves about 1000 objects behind. */
9+ /* Free the theme reference. Unfortunately GTK3 leaves about 600 objects behind. */
10 g_object_unref (gtk_icon_theme_get_default ());
11
12 /* Give GTK the signal to clean the rest and quit the application. */
13
14=== modified file 'src/xpad-pad.c'
15--- src/xpad-pad.c 2014-06-13 15:58:48 +0000
16+++ src/xpad-pad.c 2014-06-14 17:23:16 +0000
17@@ -402,7 +402,7 @@
18 {
19 XpadPad *pad = XPAD_PAD (object);
20
21- if (xpad_global_settings != NULL)
22+ if (xpad_global_settings)
23 g_signal_handlers_disconnect_matched (xpad_global_settings, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, pad);
24
25 g_free (pad->priv->infoname);
26
27=== modified file 'src/xpad-preferences.c'
28--- src/xpad-preferences.c 2014-06-13 08:31:20 +0000
29+++ src/xpad-preferences.c 2014-06-14 17:23:16 +0000
30@@ -502,7 +502,8 @@
31 {
32 XpadPreferences *pref = XPAD_PREFERENCES (object);
33
34- g_signal_handlers_disconnect_matched (xpad_global_settings, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, pref);
35+ if (xpad_global_settings)
36+ g_signal_handlers_disconnect_matched (xpad_global_settings, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, pref);
37
38 G_OBJECT_CLASS (xpad_preferences_parent_class)->finalize (object);
39 }
40
41=== modified file 'src/xpad-settings.c'
42--- src/xpad-settings.c 2014-06-13 12:51:53 +0000
43+++ src/xpad-settings.c 2014-06-14 17:23:16 +0000
44@@ -476,7 +476,7 @@
45 basedir[len-9] = '\0';
46
47 source_filename = g_strdup_printf ("%s/share/applications/xpad.desktop", basedir);
48- destination_directory = g_strdup_printf ("%s/.config/autostart/xpad.desktop", g_getenv ("HOME"));
49+ destination_directory = g_strdup_printf ("%s/.config/autostart/xpad.desktop", g_get_home_dir());
50
51 source = g_file_new_for_path (source_filename);
52 destination = g_file_new_for_path (destination_directory);
53
54=== modified file 'src/xpad-text-view.c'
55--- src/xpad-text-view.c 2014-06-13 15:50:29 +0000
56+++ src/xpad-text-view.c 2014-06-14 17:23:16 +0000
57@@ -140,7 +140,8 @@
58 {
59 XpadTextView *view = XPAD_TEXT_VIEW (object);
60
61- g_signal_handlers_disconnect_matched (xpad_global_settings, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, view);
62+ if (xpad_global_settings)
63+ g_signal_handlers_disconnect_matched (xpad_global_settings, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, view);
64
65 G_OBJECT_CLASS (xpad_text_view_parent_class)->finalize (object);
66 }

Subscribers

People subscribed via source and target branches