DBus Menu

Merge lp:~charlesk/libdbusmenu/lp-1063053 into lp:libdbusmenu/12.10

  1. lp-1063053
  2. Merge into trunk.12.10
Proposed by Charles Kerr
Status: Merged
Approved by: Ted Gould
Approved revision: 429
Merged at revision: 430
Proposed branch: lp:~charlesk/libdbusmenu/lp-1063053
Merge into: lp:libdbusmenu/12.10
Diff against target: 197 lines (+18/-18)
11 files modified
libdbusmenu-glib/client.c (+2/-2)
libdbusmenu-glib/defaults.c (+1/-1)
libdbusmenu-glib/menuitem.c (+3/-3)
libdbusmenu-glib/menuitem.h (+3/-3)
libdbusmenu-glib/server.c (+1/-1)
libdbusmenu-gtk/client.c (+3/-3)
libdbusmenu-gtk/genericmenuitem.c (+1/-1)
libdbusmenu-gtk/genericmenuitem.h (+1/-1)
libdbusmenu-gtk/menu.c (+1/-1)
libdbusmenu-gtk/parser.c (+1/-1)
tools/dbusmenu-dumper.c (+1/-1)
To merge this branch: bzr merge lp:~charlesk/libdbusmenu/lp-1063053
Reviewer Review Type Date Requested Status
Ted Gould (community) Approve
Review via email: mp+128386@code.launchpad.net

Commit message

fix grammar: use of its and it's

To post a comment you must log in.
Revision history for this message
Ted Gould (ted) wrote :

I'm tempted to reject this on the premise of "is there no place left on the Internet to make grammar mistakes?" but alas, the patch is correct.

review: Approve
Revision history for this message
Charles Kerr (charlesk) wrote :

no; ted, theres noplace left too make grammer mistake on the InterNet.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libdbusmenu-glib/client.c'
2--- libdbusmenu-glib/client.c 2012-04-05 18:35:49 +0000
3+++ libdbusmenu-glib/client.c 2012-10-07 15:38:23 +0000
4@@ -2511,7 +2511,7 @@
5 * items when they come in.
6 *
7 * This function connects into the type handling of the #DbusmenuClient.
8- * Every new menuitem that comes in immediately gets asked for it's
9+ * Every new menuitem that comes in immediately gets asked for its
10 * properties. When we get those properties we check the 'type'
11 * property and look to see if it matches a handler that is known
12 * by the client. If so, the @newfunc function is executed on that
13@@ -2542,7 +2542,7 @@
14 * the resources in @user_data.
15 *
16 * This function connects into the type handling of the #DbusmenuClient.
17- * Every new menuitem that comes in immediately gets asked for it's
18+ * Every new menuitem that comes in immediately gets asked for its
19 * properties. When we get those properties we check the 'type'
20 * property and look to see if it matches a handler that is known
21 * by the client. If so, the @newfunc function is executed on that
22
23=== modified file 'libdbusmenu-glib/defaults.c'
24--- libdbusmenu-glib/defaults.c 2012-01-26 19:50:22 +0000
25+++ libdbusmenu-glib/defaults.c 2012-10-07 15:38:23 +0000
26@@ -228,7 +228,7 @@
27 * Gets an entry in the database for a give @property and @type.
28 *
29 * Return value: (transfer none): Returns a variant that does not
30- * have it's ref count increased. If you want to keep it, you should
31+ * have its ref count increased. If you want to keep it, you should
32 * do that.
33 */
34 GVariant *
35
36=== modified file 'libdbusmenu-glib/menuitem.c'
37--- libdbusmenu-glib/menuitem.c 2012-04-25 15:38:49 +0000
38+++ libdbusmenu-glib/menuitem.c 2012-10-07 15:38:23 +0000
39@@ -192,7 +192,7 @@
40 @arg2: The position that the child is being moved to.
41 @arg3: The position that the child is was in.
42
43- Signaled when the child menuitem has had it's location
44+ Signaled when the child menuitem has had its location
45 in the list change.
46 */
47 signals[CHILD_MOVED] = g_signal_new(DBUSMENU_MENUITEM_SIGNAL_CHILD_MOVED,
48@@ -800,7 +800,7 @@
49 g_return_val_if_fail(DBUSMENU_IS_MENUITEM(child), FALSE);
50
51 if (dbusmenu_menuitem_get_parent(child) != mi) {
52- g_warning("Trying to remove a child that doesn't believe we're it's parent.");
53+ g_warning("Trying to remove a child that doesn't believe we're its parent.");
54 return FALSE;
55 }
56
57@@ -1628,7 +1628,7 @@
58 *
59 * This function will put at least one entry if this menu item has no children.
60 * If it has children it will put two for this entry, one representing the
61- * start tag and one that is a closing tag. It will allow it's
62+ * start tag and one that is a closing tag. It will allow its
63 * children to place their own tags in the array in between those two.
64 *
65 * Return value: (transfer full): Variant representing @properties
66
67=== modified file 'libdbusmenu-glib/menuitem.h'
68--- libdbusmenu-glib/menuitem.h 2012-04-25 15:38:49 +0000
69+++ libdbusmenu-glib/menuitem.h 2012-10-07 15:38:23 +0000
70@@ -409,9 +409,9 @@
71 * @properties: (allow-none): A list of properties that should be the only ones in the resulting variant structure
72 *
73 * This is the function that is called to represent this menu item
74- * as a variant. Should call it's own children.
75+ * as a variant. Should call its own children.
76 *
77- * Return value: (transfer full): A variant representing this item and it's children
78+ * Return value: (transfer full): A variant representing this item and its children
79 */
80 typedef GVariant * (*dbusmenu_menuitem_buildvariant_slot_t) (DbusmenuMenuitem * mi, gchar ** properties);
81
82@@ -528,7 +528,7 @@
83 * and copied over to the client side where it gets rendered. As
84 * the server starts to change it, and grow it, and do all kinds
85 * of fun stuff that information is transfered over DBus and the
86- * client updates it's understanding of the object model.
87+ * client updates its understanding of the object model.
88 *
89 * Most people using either the client or the server should be
90 * able to deal mostly with #DbusmenuMenuitem objects. These
91
92=== modified file 'libdbusmenu-glib/server.c'
93--- libdbusmenu-glib/server.c 2012-04-14 17:52:48 +0000
94+++ libdbusmenu-glib/server.c 2012-10-07 15:38:23 +0000
95@@ -292,7 +292,7 @@
96 @arg2: The timestamp of when the event happened
97
98 This is signaled when a menuitem under this server
99- sends it's activate signal.
100+ sends its activate signal.
101 */
102 signals[ITEM_ACTIVATION] = g_signal_new(DBUSMENU_SERVER_SIGNAL_ITEM_ACTIVATION,
103 G_TYPE_FROM_CLASS(class),
104
105=== modified file 'libdbusmenu-gtk/client.c'
106--- libdbusmenu-gtk/client.c 2012-03-27 21:23:09 +0000
107+++ libdbusmenu-gtk/client.c 2012-10-07 15:38:23 +0000
108@@ -193,7 +193,7 @@
109 return;
110 }
111
112-/* Unreference the theme directory, and if it's count goes to zero then
113+/* Unreference the theme directory, and if its count goes to zero then
114 we need to remove it from the search path. */
115 static void
116 theme_dir_unref (GtkIconTheme * theme, GHashTable * db, const gchar * dir)
117@@ -462,7 +462,7 @@
118 static void
119 menu_item_start_activating(DbusmenuMenuitem * mi)
120 {
121- /* Mark this item and all it's parents as activating */
122+ /* Mark this item and all its parents as activating */
123 DbusmenuMenuitem * parent = mi;
124 do {
125 g_object_set_data(G_OBJECT(parent), data_activating,
126@@ -485,7 +485,7 @@
127 if (!menu_item_is_activating(mi))
128 return;
129
130- /* Mark this item and all it's parents as not activating and finally
131+ /* Mark this item and all its parents as not activating and finally
132 send their queued close event. */
133 g_object_set_data(G_OBJECT(mi), data_activating, GINT_TO_POINTER(FALSE));
134
135
136=== modified file 'libdbusmenu-gtk/genericmenuitem.c'
137--- libdbusmenu-gtk/genericmenuitem.c 2012-06-04 13:29:56 +0000
138+++ libdbusmenu-gtk/genericmenuitem.c 2012-10-07 15:38:23 +0000
139@@ -1,6 +1,6 @@
140 /*
141 A menuitem subclass that has the ability to do lots of different
142-things depending on it's settings.
143+things depending on its settings.
144
145 Copyright 2009 Canonical Ltd.
146
147
148=== modified file 'libdbusmenu-gtk/genericmenuitem.h'
149--- libdbusmenu-gtk/genericmenuitem.h 2011-08-24 20:41:33 +0000
150+++ libdbusmenu-gtk/genericmenuitem.h 2012-10-07 15:38:23 +0000
151@@ -1,6 +1,6 @@
152 /*
153 A menuitem subclass that has the ability to do lots of different
154-things depending on it's settings.
155+things depending on its settings.
156
157 Copyright 2009 Canonical Ltd.
158
159
160=== modified file 'libdbusmenu-gtk/menu.c'
161--- libdbusmenu-gtk/menu.c 2011-04-11 04:40:48 +0000
162+++ libdbusmenu-gtk/menu.c 2012-10-07 15:38:23 +0000
163@@ -296,7 +296,7 @@
164 return;
165 }
166
167-/* Called when the child is realized, and thus has all of it's
168+/* Called when the child is realized, and thus has all of its
169 properties and GTK-isms. We can put it in our menu here. */
170 static void
171 child_realized (DbusmenuMenuitem * child, gpointer userdata)
172
173=== modified file 'libdbusmenu-gtk/parser.c'
174--- libdbusmenu-gtk/parser.c 2012-09-24 16:06:38 +0000
175+++ libdbusmenu-gtk/parser.c 2012-10-07 15:38:23 +0000
176@@ -340,7 +340,7 @@
177 return;
178 }
179
180-/* Gets the positon of the child with its' parent if it has one.
181+/* Gets the positon of the child with its parent if it has one.
182 Returns -1 if the position is unable to be calculated. */
183 static gint
184 get_child_position (GtkWidget * child)
185
186=== modified file 'tools/dbusmenu-dumper.c'
187--- tools/dbusmenu-dumper.c 2012-03-27 20:46:21 +0000
188+++ tools/dbusmenu-dumper.c 2012-10-07 15:38:23 +0000
189@@ -112,7 +112,7 @@
190 }
191
192 /* Checks whether we need to watch a menu item, and recurses down to
193- it's children as well */
194+ its children as well */
195 static void
196 check_realizations (DbusmenuMenuitem * item)
197 {

Subscribers

People subscribed via source and target branches

to all changes: