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
=== modified file 'libdbusmenu-glib/client.c'
--- libdbusmenu-glib/client.c 2012-04-05 18:35:49 +0000
+++ libdbusmenu-glib/client.c 2012-10-07 15:38:23 +0000
@@ -2511,7 +2511,7 @@
2511 * items when they come in.2511 * items when they come in.
2512 * 2512 *
2513 * This function connects into the type handling of the #DbusmenuClient.2513 * This function connects into the type handling of the #DbusmenuClient.
2514 * Every new menuitem that comes in immediately gets asked for it's2514 * Every new menuitem that comes in immediately gets asked for its
2515 * properties. When we get those properties we check the 'type'2515 * properties. When we get those properties we check the 'type'
2516 * property and look to see if it matches a handler that is known2516 * property and look to see if it matches a handler that is known
2517 * by the client. If so, the @newfunc function is executed on that2517 * by the client. If so, the @newfunc function is executed on that
@@ -2542,7 +2542,7 @@
2542 * the resources in @user_data.2542 * the resources in @user_data.
2543 * 2543 *
2544 * This function connects into the type handling of the #DbusmenuClient.2544 * This function connects into the type handling of the #DbusmenuClient.
2545 * Every new menuitem that comes in immediately gets asked for it's2545 * Every new menuitem that comes in immediately gets asked for its
2546 * properties. When we get those properties we check the 'type'2546 * properties. When we get those properties we check the 'type'
2547 * property and look to see if it matches a handler that is known2547 * property and look to see if it matches a handler that is known
2548 * by the client. If so, the @newfunc function is executed on that2548 * by the client. If so, the @newfunc function is executed on that
25492549
=== modified file 'libdbusmenu-glib/defaults.c'
--- libdbusmenu-glib/defaults.c 2012-01-26 19:50:22 +0000
+++ libdbusmenu-glib/defaults.c 2012-10-07 15:38:23 +0000
@@ -228,7 +228,7 @@
228 * Gets an entry in the database for a give @property and @type.228 * Gets an entry in the database for a give @property and @type.
229 *229 *
230 * Return value: (transfer none): Returns a variant that does not230 * Return value: (transfer none): Returns a variant that does not
231 * have it's ref count increased. If you want to keep it, you should231 * have its ref count increased. If you want to keep it, you should
232 * do that.232 * do that.
233 */233 */
234GVariant *234GVariant *
235235
=== modified file 'libdbusmenu-glib/menuitem.c'
--- libdbusmenu-glib/menuitem.c 2012-04-25 15:38:49 +0000
+++ libdbusmenu-glib/menuitem.c 2012-10-07 15:38:23 +0000
@@ -192,7 +192,7 @@
192 @arg2: The position that the child is being moved to.192 @arg2: The position that the child is being moved to.
193 @arg3: The position that the child is was in.193 @arg3: The position that the child is was in.
194194
195 Signaled when the child menuitem has had it's location195 Signaled when the child menuitem has had its location
196 in the list change.196 in the list change.
197 */197 */
198 signals[CHILD_MOVED] = g_signal_new(DBUSMENU_MENUITEM_SIGNAL_CHILD_MOVED,198 signals[CHILD_MOVED] = g_signal_new(DBUSMENU_MENUITEM_SIGNAL_CHILD_MOVED,
@@ -800,7 +800,7 @@
800 g_return_val_if_fail(DBUSMENU_IS_MENUITEM(child), FALSE);800 g_return_val_if_fail(DBUSMENU_IS_MENUITEM(child), FALSE);
801801
802 if (dbusmenu_menuitem_get_parent(child) != mi) {802 if (dbusmenu_menuitem_get_parent(child) != mi) {
803 g_warning("Trying to remove a child that doesn't believe we're it's parent.");803 g_warning("Trying to remove a child that doesn't believe we're its parent.");
804 return FALSE;804 return FALSE;
805 }805 }
806806
@@ -1628,7 +1628,7 @@
1628 * 1628 *
1629 * This function will put at least one entry if this menu item has no children.1629 * This function will put at least one entry if this menu item has no children.
1630 * If it has children it will put two for this entry, one representing the1630 * If it has children it will put two for this entry, one representing the
1631 * start tag and one that is a closing tag. It will allow it's1631 * start tag and one that is a closing tag. It will allow its
1632 * children to place their own tags in the array in between those two.1632 * children to place their own tags in the array in between those two.
1633 *1633 *
1634 * Return value: (transfer full): Variant representing @properties1634 * Return value: (transfer full): Variant representing @properties
16351635
=== modified file 'libdbusmenu-glib/menuitem.h'
--- libdbusmenu-glib/menuitem.h 2012-04-25 15:38:49 +0000
+++ libdbusmenu-glib/menuitem.h 2012-10-07 15:38:23 +0000
@@ -409,9 +409,9 @@
409 * @properties: (allow-none): A list of properties that should be the only ones in the resulting variant structure409 * @properties: (allow-none): A list of properties that should be the only ones in the resulting variant structure
410 * 410 *
411 * This is the function that is called to represent this menu item411 * This is the function that is called to represent this menu item
412 * as a variant. Should call it's own children.412 * as a variant. Should call its own children.
413 *413 *
414 * Return value: (transfer full): A variant representing this item and it's children414 * Return value: (transfer full): A variant representing this item and its children
415 */415 */
416typedef GVariant * (*dbusmenu_menuitem_buildvariant_slot_t) (DbusmenuMenuitem * mi, gchar ** properties);416typedef GVariant * (*dbusmenu_menuitem_buildvariant_slot_t) (DbusmenuMenuitem * mi, gchar ** properties);
417417
@@ -528,7 +528,7 @@
528 * and copied over to the client side where it gets rendered. As528 * and copied over to the client side where it gets rendered. As
529 * the server starts to change it, and grow it, and do all kinds529 * the server starts to change it, and grow it, and do all kinds
530 * of fun stuff that information is transfered over DBus and the530 * of fun stuff that information is transfered over DBus and the
531 * client updates it's understanding of the object model.531 * client updates its understanding of the object model.
532 * 532 *
533 * Most people using either the client or the server should be533 * Most people using either the client or the server should be
534 * able to deal mostly with #DbusmenuMenuitem objects. These534 * able to deal mostly with #DbusmenuMenuitem objects. These
535535
=== modified file 'libdbusmenu-glib/server.c'
--- libdbusmenu-glib/server.c 2012-04-14 17:52:48 +0000
+++ libdbusmenu-glib/server.c 2012-10-07 15:38:23 +0000
@@ -292,7 +292,7 @@
292 @arg2: The timestamp of when the event happened292 @arg2: The timestamp of when the event happened
293293
294 This is signaled when a menuitem under this server294 This is signaled when a menuitem under this server
295 sends it's activate signal.295 sends its activate signal.
296 */296 */
297 signals[ITEM_ACTIVATION] = g_signal_new(DBUSMENU_SERVER_SIGNAL_ITEM_ACTIVATION,297 signals[ITEM_ACTIVATION] = g_signal_new(DBUSMENU_SERVER_SIGNAL_ITEM_ACTIVATION,
298 G_TYPE_FROM_CLASS(class),298 G_TYPE_FROM_CLASS(class),
299299
=== modified file 'libdbusmenu-gtk/client.c'
--- libdbusmenu-gtk/client.c 2012-03-27 21:23:09 +0000
+++ libdbusmenu-gtk/client.c 2012-10-07 15:38:23 +0000
@@ -193,7 +193,7 @@
193 return;193 return;
194}194}
195195
196/* Unreference the theme directory, and if it's count goes to zero then196/* Unreference the theme directory, and if its count goes to zero then
197 we need to remove it from the search path. */197 we need to remove it from the search path. */
198static void198static void
199theme_dir_unref (GtkIconTheme * theme, GHashTable * db, const gchar * dir)199theme_dir_unref (GtkIconTheme * theme, GHashTable * db, const gchar * dir)
@@ -462,7 +462,7 @@
462static void462static void
463menu_item_start_activating(DbusmenuMenuitem * mi)463menu_item_start_activating(DbusmenuMenuitem * mi)
464{464{
465 /* Mark this item and all it's parents as activating */465 /* Mark this item and all its parents as activating */
466 DbusmenuMenuitem * parent = mi;466 DbusmenuMenuitem * parent = mi;
467 do {467 do {
468 g_object_set_data(G_OBJECT(parent), data_activating,468 g_object_set_data(G_OBJECT(parent), data_activating,
@@ -485,7 +485,7 @@
485 if (!menu_item_is_activating(mi))485 if (!menu_item_is_activating(mi))
486 return;486 return;
487487
488 /* Mark this item and all it's parents as not activating and finally488 /* Mark this item and all its parents as not activating and finally
489 send their queued close event. */489 send their queued close event. */
490 g_object_set_data(G_OBJECT(mi), data_activating, GINT_TO_POINTER(FALSE));490 g_object_set_data(G_OBJECT(mi), data_activating, GINT_TO_POINTER(FALSE));
491491
492492
=== modified file 'libdbusmenu-gtk/genericmenuitem.c'
--- libdbusmenu-gtk/genericmenuitem.c 2012-06-04 13:29:56 +0000
+++ libdbusmenu-gtk/genericmenuitem.c 2012-10-07 15:38:23 +0000
@@ -1,6 +1,6 @@
1/*1/*
2A menuitem subclass that has the ability to do lots of different2A menuitem subclass that has the ability to do lots of different
3things depending on it's settings.3things depending on its settings.
44
5Copyright 2009 Canonical Ltd.5Copyright 2009 Canonical Ltd.
66
77
=== modified file 'libdbusmenu-gtk/genericmenuitem.h'
--- libdbusmenu-gtk/genericmenuitem.h 2011-08-24 20:41:33 +0000
+++ libdbusmenu-gtk/genericmenuitem.h 2012-10-07 15:38:23 +0000
@@ -1,6 +1,6 @@
1/*1/*
2A menuitem subclass that has the ability to do lots of different2A menuitem subclass that has the ability to do lots of different
3things depending on it's settings.3things depending on its settings.
44
5Copyright 2009 Canonical Ltd.5Copyright 2009 Canonical Ltd.
66
77
=== modified file 'libdbusmenu-gtk/menu.c'
--- libdbusmenu-gtk/menu.c 2011-04-11 04:40:48 +0000
+++ libdbusmenu-gtk/menu.c 2012-10-07 15:38:23 +0000
@@ -296,7 +296,7 @@
296 return;296 return;
297}297}
298298
299/* Called when the child is realized, and thus has all of it's299/* Called when the child is realized, and thus has all of its
300 properties and GTK-isms. We can put it in our menu here. */300 properties and GTK-isms. We can put it in our menu here. */
301static void301static void
302child_realized (DbusmenuMenuitem * child, gpointer userdata)302child_realized (DbusmenuMenuitem * child, gpointer userdata)
303303
=== modified file 'libdbusmenu-gtk/parser.c'
--- libdbusmenu-gtk/parser.c 2012-09-24 16:06:38 +0000
+++ libdbusmenu-gtk/parser.c 2012-10-07 15:38:23 +0000
@@ -340,7 +340,7 @@
340 return;340 return;
341}341}
342342
343/* Gets the positon of the child with its' parent if it has one.343/* Gets the positon of the child with its parent if it has one.
344 Returns -1 if the position is unable to be calculated. */344 Returns -1 if the position is unable to be calculated. */
345static gint345static gint
346get_child_position (GtkWidget * child)346get_child_position (GtkWidget * child)
347347
=== modified file 'tools/dbusmenu-dumper.c'
--- tools/dbusmenu-dumper.c 2012-03-27 20:46:21 +0000
+++ tools/dbusmenu-dumper.c 2012-10-07 15:38:23 +0000
@@ -112,7 +112,7 @@
112}112}
113113
114/* Checks whether we need to watch a menu item, and recurses down to114/* Checks whether we need to watch a menu item, and recurses down to
115 it's children as well */115 its children as well */
116static void116static void
117check_realizations (DbusmenuMenuitem * item)117check_realizations (DbusmenuMenuitem * item)
118{118{

Subscribers

People subscribed via source and target branches

to all changes: