ayatana-commits team mailing list archive

Thread
Date

[Branch ~dbusmenu-team/dbusmenu/trunk] Rev 228: Bad merge, forgot this change in name

To: ayatana-commits <ayatana-commits@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Thu, 24 Feb 2011 15:07:30 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

------------------------------------------------------------
revno: 228
committer: Ted Gould <ted@xxxxxxxx>
branch nick: trunk
timestamp: Thu 2011-02-24 08:56:30 -0600
message:
  Bad merge, forgot this change in name
modified:
  libdbusmenu-glib/server.h


--
lp:dbusmenu
https://code.launchpad.net/~dbusmenu-team/dbusmenu/trunk

Your team ayatana-commits is subscribed to branch lp:dbusmenu.
To unsubscribe from this branch go to https://code.launchpad.net/~dbusmenu-team/dbusmenu/trunk/+edit-subscription

=== modified file 'libdbusmenu-glib/server.h'
--- libdbusmenu-glib/server.h	2011-02-24 14:33:06 +0000
+++ libdbusmenu-glib/server.h	2011-02-24 14:56:30 +0000
@@ -149,7 +149,7 @@
 
 GType                   dbusmenu_server_get_type            (void);
 DbusmenuServer *        dbusmenu_server_new                 (const gchar *          object);
-void                    dbusmenu_server_set_root            (DbusmenuServer *       server,
+void                    dbusmenu_server_set_root            (DbusmenuServer *       self,
                                                              DbusmenuMenuitem *     root);
 DbusmenuTextDirection   dbusmenu_server_get_text_direction  (DbusmenuServer *       server);
 void                    dbusmenu_server_set_text_direction  (DbusmenuServer *       server,