← Back to branch summary

~robert-ancell/accountsservice/lp1376357

« back to all changes in this revision

Viewing changes to debian/patches/0016-add-input-sources-support.patch

  • Committer: Robert Ancell
  • Date: 2014-10-01 23:25:55 UTC
  • Revision ID: robert.ancell@canonical.com-20141001232555-mg3vlx4nk58il83f
https://launchpad.net/bugs/1376357
* debian/patches/0012-add-keyboard-layout-support.patch:
  - Don't emit Changed on a user when XKeyboardLayouts is set to the same
    value (LP: #1376357)
  - Fix compile warnings and a potential crasher
* debian/patches/0013-add-has-message-support.patch:
  - Don't emit Changed on a user when XHasMessages is set to the same value
    (LP: #1376357)
* debian/libaccountsservice0.symbols:
  - Updated

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/0016-add-input-sources-support.patch
10
10
 src/user.c                             | 212 +++++++++++++++++++++++++++++++++
11
11
 4 files changed, 342 insertions(+)
12
12
 
13
 
Index: accountsservice-0.6.35/data/org.freedesktop.Accounts.User.xml
 
13
Index: accountsservice-0.6.37/data/org.freedesktop.Accounts.User.xml
14
14
===================================================================
15
 
--- accountsservice-0.6.35.orig/data/org.freedesktop.Accounts.User.xml  2013-11-13 15:22:20.912135211 +0100
16
 
+++ accountsservice-0.6.35/data/org.freedesktop.Accounts.User.xml       2013-11-13 15:22:20.900135210 +0100
 
15
--- accountsservice-0.6.37.orig/data/org.freedesktop.Accounts.User.xml
 
16
+++ accountsservice-0.6.37/data/org.freedesktop.Accounts.User.xml
17
17
@@ -185,6 +185,41 @@
18
18
     </doc:doc>
19
19
   </method>
73
73
   </property>
74
74
 
75
75
   <property name="XSession" type="s" access="read">
76
 
Index: accountsservice-0.6.35/src/libaccountsservice/act-user.c
 
76
Index: accountsservice-0.6.37/src/libaccountsservice/act-user.c
77
77
===================================================================
78
 
--- accountsservice-0.6.35.orig/src/libaccountsservice/act-user.c       2013-11-13 15:22:20.912135211 +0100
79
 
+++ accountsservice-0.6.35/src/libaccountsservice/act-user.c    2013-11-13 15:22:20.900135210 +0100
80
 
@@ -100,6 +100,7 @@
 
78
--- accountsservice-0.6.37.orig/src/libaccountsservice/act-user.c
 
79
+++ accountsservice-0.6.37/src/libaccountsservice/act-user.c
 
80
@@ -100,6 +100,7 @@ enum {
81
81
         PROP_ICON_FILE,
82
82
         PROP_LANGUAGE,
83
83
         PROP_FORMATS_LOCALE,
85
85
         PROP_X_SESSION,
86
86
         PROP_IS_LOADED
87
87
 };
88
 
@@ -132,6 +133,7 @@
 
88
@@ -132,6 +133,7 @@ struct _ActUser {
89
89
         char           *icon_file;
90
90
         char           *language;
91
91
         char           *formats_locale;
93
93
         char           *x_session;
94
94
         GList          *our_sessions;
95
95
         GList          *other_sessions;
96
 
@@ -331,6 +333,9 @@
 
96
@@ -331,6 +333,9 @@ act_user_get_property (GObject    *objec
97
97
         case PROP_FORMATS_LOCALE:
98
98
                 g_value_set_string (value, user->formats_locale);
99
99
                 break;
103
103
         case PROP_X_SESSION:
104
104
                 g_value_set_string (value, user->x_session);
105
105
                 break;
106
 
@@ -515,6 +520,14 @@
 
106
@@ -515,6 +520,14 @@ act_user_class_init (ActUserClass *class
107
107
                                                               NULL,
108
108
                                                               G_PARAM_READABLE));
109
109
         g_object_class_install_property (gobject_class,
118
118
                                          PROP_X_SESSION,
119
119
                                          g_param_spec_string ("x-session",
120
120
                                                               "X session",
121
 
@@ -634,6 +647,8 @@
 
121
@@ -634,6 +647,8 @@ act_user_finalize (GObject *object)
122
122
         g_free (user->shell);
123
123
         g_free (user->email);
124
124
         g_free (user->location);
127
127
         if (user->login_history)
128
128
           g_variant_unref (user->login_history);
129
129
         g_free (user->formats_locale);
130
 
@@ -1170,6 +1185,22 @@
 
130
@@ -1170,6 +1185,22 @@ act_user_get_formats_locale (ActUser *us
131
131
 }
132
132
 
133
133
 /**
150
150
  * act_user_get_x_session:
151
151
  * @user: a #ActUser
152
152
  *
153
 
@@ -1456,6 +1487,19 @@
 
153
@@ -1450,6 +1481,19 @@ collect_props (const gchar *key,
154
154
                         g_object_notify (G_OBJECT (user), "formats_locale");
155
155
                 }
156
156
 
170
170
         } else if (strcmp (key, "XSession") == 0) {
171
171
                 const char *new_x_session;
172
172
 
173
 
@@ -1712,6 +1756,15 @@
 
173
@@ -1706,6 +1750,15 @@ _act_user_load_from_user (ActUser    *us
174
174
         user->language = g_strdup (user_to_copy->language);
175
175
         g_object_notify (G_OBJECT (user), "language");
176
176
 
186
186
         g_free (user->x_session);
187
187
         user->x_session = g_strdup (user_to_copy->x_session);
188
188
         g_object_notify (G_OBJECT (user), "x-session");
189
 
@@ -1895,6 +1948,35 @@
 
189
@@ -1889,6 +1942,35 @@ act_user_set_language (ActUser    *user,
190
190
                 g_error_free (error);
191
191
                 return;
192
192
         }
222
222
 }
223
223
 
224
224
 /**
225
 
Index: accountsservice-0.6.35/src/libaccountsservice/act-user.h
 
225
Index: accountsservice-0.6.37/src/libaccountsservice/act-user.h
226
226
===================================================================
227
 
--- accountsservice-0.6.35.orig/src/libaccountsservice/act-user.h       2013-11-13 15:22:20.912135211 +0100
228
 
+++ accountsservice-0.6.35/src/libaccountsservice/act-user.h    2013-11-13 15:22:20.900135210 +0100
229
 
@@ -84,6 +84,7 @@
 
227
--- accountsservice-0.6.37.orig/src/libaccountsservice/act-user.h
 
228
+++ accountsservice-0.6.37/src/libaccountsservice/act-user.h
 
229
@@ -84,6 +84,7 @@ gboolean       act_user_is_nonexistent
230
230
 const char    *act_user_get_icon_file             (ActUser   *user);
231
231
 const char    *act_user_get_language              (ActUser   *user);
232
232
 const char    *act_user_get_formats_locale        (ActUser   *user);
234
234
 const char    *act_user_get_x_session             (ActUser   *user);
235
235
 const char    *act_user_get_primary_session_id    (ActUser   *user);
236
236
 
237
 
@@ -97,6 +98,8 @@
 
237
@@ -97,6 +98,8 @@ void           act_user_set_language
238
238
                                                    const char *language);
239
239
 void           act_user_set_formats_locale        (ActUser    *user,
240
240
                                                    const char *formats_locale);
243
243
 void           act_user_set_x_session             (ActUser    *user,
244
244
                                                    const char *x_session);
245
245
 void           act_user_set_location              (ActUser    *user,
246
 
Index: accountsservice-0.6.35/src/user.c
 
246
Index: accountsservice-0.6.37/src/user.c
247
247
===================================================================
248
 
--- accountsservice-0.6.35.orig/src/user.c      2013-11-13 15:22:20.912135211 +0100
249
 
+++ accountsservice-0.6.35/src/user.c   2013-11-13 15:22:20.904135211 +0100
250
 
@@ -63,6 +63,7 @@
 
248
--- accountsservice-0.6.37.orig/src/user.c
 
249
+++ accountsservice-0.6.37/src/user.c
 
250
@@ -63,6 +63,7 @@ enum {
251
251
         PROP_EMAIL,
252
252
         PROP_LANGUAGE,
253
253
         PROP_FORMATS_LOCALE,
255
255
         PROP_X_SESSION,
256
256
         PROP_LOCATION,
257
257
         PROP_LOGIN_FREQUENCY,
258
 
@@ -104,6 +105,7 @@
 
258
@@ -104,6 +105,7 @@ struct User {
259
259
         gchar        *email;
260
260
         gchar        *language;
261
261
         gchar        *formats_locale;
263
263
         gchar        *x_session;
264
264
         gchar        *location;
265
265
         guint64       login_frequency;
266
 
@@ -330,6 +332,75 @@
 
266
@@ -330,6 +332,75 @@ user_update_from_pwent (User          *u
267
267
                 accounts_user_emit_changed (ACCOUNTS_USER (user));
268
268
 }
269
269
 
339
339
 void
340
340
 user_update_from_keyfile (User     *user,
341
341
                           GKeyFile *keyfile)
342
 
@@ -353,6 +424,11 @@
 
342
@@ -354,6 +425,11 @@ user_update_from_keyfile (User     *user
343
343
                 g_object_notify (G_OBJECT (user), "formats-locale");
344
344
         }
345
345
 
351
351
         s = g_key_file_get_string (keyfile, "User", "XSession", NULL);
352
352
         if (s != NULL) {
353
353
                 g_free (user->x_session);
354
 
@@ -439,6 +515,51 @@
 
354
@@ -440,6 +516,51 @@ user_update_system_account_property (Use
355
355
 }
356
356
 
357
357
 static void
403
403
 user_save_to_keyfile (User     *user,
404
404
                       GKeyFile *keyfile)
405
405
 {
406
 
@@ -453,6 +574,9 @@
 
406
@@ -454,6 +575,9 @@ user_save_to_keyfile (User     *user,
407
407
         if (user->formats_locale)
408
408
                 g_key_file_set_string (keyfile, "User", "FormatsLocale", user->formats_locale);
409
409
 
413
413
         if (user->x_session)
414
414
                 g_key_file_set_string (keyfile, "User", "XSession", user->x_session);
415
415
 
416
 
@@ -1578,6 +1702,67 @@
 
416
@@ -1580,6 +1704,67 @@ user_set_formats_locale (AccountsUser
417
417
 }
418
418
 
419
419
 static void
481
481
 user_change_x_session_authorized_cb (Daemon                *daemon,
482
482
                                      User                  *user,
483
483
                                      GDBusMethodInvocation *context,
484
 
@@ -2926,6 +3111,12 @@
 
484
@@ -2952,6 +3137,12 @@ user_real_get_language (AccountsUser *us
485
485
         return USER (user)->language;
486
486
 }
487
487
 
494
494
 static const gchar *
495
495
 user_real_get_xsession (AccountsUser *user)
496
496
 {
497
 
@@ -3025,6 +3216,9 @@
 
497
@@ -3051,6 +3242,9 @@ user_finalize (GObject *object)
498
498
        if (user->login_history)
499
499
                g_variant_unref (user->login_history);
500
500
 
504
504
         if (G_OBJECT_CLASS (user_parent_class)->finalize)
505
505
                 (*G_OBJECT_CLASS (user_parent_class)->finalize) (object);
506
506
 }
507
 
@@ -3036,6 +3230,7 @@
 
507
@@ -3062,6 +3256,7 @@ user_set_property (GObject      *object,
508
508
                    GParamSpec   *pspec)
509
509
 {
510
510
         User *user = USER (object);
512
512
 
513
513
         switch (param_id) {
514
514
         case PROP_ACCOUNT_TYPE:
515
 
@@ -3047,6 +3242,18 @@
 
515
@@ -3073,6 +3268,18 @@ user_set_property (GObject      *object,
516
516
         case PROP_FORMATS_LOCALE:
517
517
                 user->formats_locale = g_value_dup_string (value);
518
518
                 break;
531
531
         case PROP_X_SESSION:
532
532
                 user->x_session = g_value_dup_string (value);
533
533
                 break;
534
 
@@ -3124,6 +3331,9 @@
 
534
@@ -3150,6 +3357,9 @@ user_get_property (GObject    *object,
535
535
                 else
536
536
                         g_value_set_string (value, user_get_fallback_value (user, "FormatsLocale"));
537
537
                 break;
541
541
         case PROP_X_SESSION:
542
542
                 g_value_set_string (value, user->x_session);
543
543
                 break;
544
 
@@ -3201,6 +3411,7 @@
 
544
@@ -3227,6 +3437,7 @@ user_accounts_user_iface_init (AccountsU
545
545
         iface->handle_set_home_directory = user_set_home_directory;
546
546
         iface->handle_set_icon_file = user_set_icon_file;
547
547
         iface->handle_set_language = user_set_language;
549
549
         iface->handle_set_location = user_set_location;
550
550
         iface->handle_set_locked = user_set_locked;
551
551
         iface->handle_continue_set_password = user_continue_set_password;
552
 
@@ -3221,6 +3432,7 @@
 
552
@@ -3247,6 +3458,7 @@ user_accounts_user_iface_init (AccountsU
553
553
         iface->get_shell = user_real_get_shell;
554
554
         iface->get_email = user_real_get_email;
555
555
         iface->get_language = user_real_get_language;
557
557
         iface->get_xsession = user_real_get_xsession;
558
558
         iface->get_location = user_real_get_location;
559
559
         iface->get_login_frequency = user_real_get_login_frequency;
560
 
@@ -3256,6 +3468,7 @@
 
560
@@ -3282,6 +3494,7 @@ user_init (User *user)
561
561
         user->email = NULL;
562
562
         user->language = NULL;
563
563
         user->formats_locale = NULL;