[gnome-panel/wip/3.0-freeze-break] panel: Rename panel_toplevel_get_toplevel_id to panel_toplevel_get_id

[Vincent Untz <vuntz src gnome org>]

commit f878b14662fb541c2717e90db9687b7770faf8f2
Author: Vincent Untz <vuntz gnome org>
Date:   Fri Mar 25 23:28:00 2011 +0100

    panel: Rename panel_toplevel_get_toplevel_id to panel_toplevel_get_id

 gnome-panel/applet.c              |    2 +-
 gnome-panel/launcher.c            |    2 +-
 gnome-panel/panel-action-button.c |    2 +-
 gnome-panel/panel-applet-frame.c  |    2 +-
 gnome-panel/panel-layout.c        |    4 ++--
 gnome-panel/panel-menu-bar.c      |    2 +-
 gnome-panel/panel-menu-button.c   |    2 +-
 gnome-panel/panel-separator.c     |    2 +-
 gnome-panel/panel-toplevel.c      |    2 +-
 gnome-panel/panel-toplevel.h      |    2 +-
 gnome-panel/panel.c               |    4 ++--
 11 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/gnome-panel/applet.c b/gnome-panel/applet.c
index 2ecd806..ceecb79 100644
--- a/gnome-panel/applet.c
+++ b/gnome-panel/applet.c
@@ -803,7 +803,7 @@ panel_applet_get_toplevel_id (AppletInfo *applet)
 	if (!panel_widget)
 		return NULL;
 
-	return panel_toplevel_get_toplevel_id (panel_widget->toplevel);
+	return panel_toplevel_get_id (panel_widget->toplevel);
 }
 
 static gboolean
diff --git a/gnome-panel/launcher.c b/gnome-panel/launcher.c
index 9c22d42..286bc68 100644
--- a/gnome-panel/launcher.c
+++ b/gnome-panel/launcher.c
@@ -1005,7 +1005,7 @@ panel_launcher_create (PanelToplevel *toplevel,
 		       int            position,
 		       const char    *location)
 {
-	panel_launcher_create_with_id (panel_toplevel_get_toplevel_id (toplevel),
+	panel_launcher_create_with_id (panel_toplevel_get_id (toplevel),
 				       position,
 				       location);
 }
diff --git a/gnome-panel/panel-action-button.c b/gnome-panel/panel-action-button.c
index 07486df..4e17a88 100644
--- a/gnome-panel/panel-action-button.c
+++ b/gnome-panel/panel-action-button.c
@@ -661,7 +661,7 @@ panel_action_button_create (PanelToplevel         *toplevel,
 
 	panel_layout_object_create (PANEL_OBJECT_ACTION,
 				    detail,
-				    panel_toplevel_get_toplevel_id (toplevel),
+				    panel_toplevel_get_id (toplevel),
 				    position, FALSE);
 }
 
diff --git a/gnome-panel/panel-applet-frame.c b/gnome-panel/panel-applet-frame.c
index a3db251..29fa427 100644
--- a/gnome-panel/panel-applet-frame.c
+++ b/gnome-panel/panel-applet-frame.c
@@ -1009,6 +1009,6 @@ panel_applet_frame_create (PanelToplevel *toplevel,
 
 	panel_layout_object_create (PANEL_OBJECT_APPLET,
 				    iid,
-				    panel_toplevel_get_toplevel_id (toplevel),
+				    panel_toplevel_get_id (toplevel),
 				    position, FALSE);
 }
diff --git a/gnome-panel/panel-layout.c b/gnome-panel/panel-layout.c
index 95fbc44..84b1265 100644
--- a/gnome-panel/panel-layout.c
+++ b/gnome-panel/panel-layout.c
@@ -811,7 +811,7 @@ panel_layout_changed_toplevel (void)
         to_remove = NULL;
 
         for (l = panel_toplevel_list_toplevels (); l != NULL; l = l->next) {
-                id = panel_toplevel_get_toplevel_id (l->data);
+                id = panel_toplevel_get_id (l->data);
                 found = FALSE;
 
                 for (i = 0; ids[i] != NULL; i++) {
@@ -838,7 +838,7 @@ panel_layout_changed_toplevel (void)
                 found = FALSE;
 
                 for (l = panel_toplevel_list_toplevels (); l != NULL; l = l->next) {
-                        id = panel_toplevel_get_toplevel_id (l->data);
+                        id = panel_toplevel_get_id (l->data);
                         if (g_strcmp0 (ids[i], id) == 0) {
                                 found = TRUE;
                                 break;
diff --git a/gnome-panel/panel-menu-bar.c b/gnome-panel/panel-menu-bar.c
index 43fa8a1..e5617ed 100644
--- a/gnome-panel/panel-menu-bar.c
+++ b/gnome-panel/panel-menu-bar.c
@@ -435,7 +435,7 @@ panel_menu_bar_create (PanelToplevel *toplevel,
 		       int            position)
 {
 	panel_layout_object_create (PANEL_OBJECT_MENU_BAR, NULL,
-				    panel_toplevel_get_toplevel_id (toplevel),
+				    panel_toplevel_get_id (toplevel),
 				    position, FALSE);
 }
 
diff --git a/gnome-panel/panel-menu-button.c b/gnome-panel/panel-menu-button.c
index 837283d..7283019 100644
--- a/gnome-panel/panel-menu-button.c
+++ b/gnome-panel/panel-menu-button.c
@@ -783,7 +783,7 @@ panel_menu_button_create (PanelToplevel *toplevel,
 	}
 
 	id = panel_layout_object_create_start (PANEL_OBJECT_MENU, NULL,
-					       panel_toplevel_get_toplevel_id (toplevel),
+					       panel_toplevel_get_id (toplevel),
 					       position, FALSE,
 					       &settings);
 
diff --git a/gnome-panel/panel-separator.c b/gnome-panel/panel-separator.c
index 3f1f57e..07feba3 100644
--- a/gnome-panel/panel-separator.c
+++ b/gnome-panel/panel-separator.c
@@ -260,7 +260,7 @@ panel_separator_create (PanelToplevel *toplevel,
 			int            position)
 {
 	panel_layout_object_create (PANEL_OBJECT_SEPARATOR, NULL,
-				    panel_toplevel_get_toplevel_id (toplevel),
+				    panel_toplevel_get_id (toplevel),
 				    position, FALSE);
 }
 
diff --git a/gnome-panel/panel-toplevel.c b/gnome-panel/panel-toplevel.c
index 7f85c8f..82ea2ae 100644
--- a/gnome-panel/panel-toplevel.c
+++ b/gnome-panel/panel-toplevel.c
@@ -4576,7 +4576,7 @@ panel_toplevel_set_toplevel_id (PanelToplevel *toplevel,
 }
 
 G_CONST_RETURN char *
-panel_toplevel_get_toplevel_id (PanelToplevel *toplevel)
+panel_toplevel_get_id (PanelToplevel *toplevel)
 {
 	g_return_val_if_fail (PANEL_IS_TOPLEVEL (toplevel), NULL);
 
diff --git a/gnome-panel/panel-toplevel.h b/gnome-panel/panel-toplevel.h
index 76e0faf..c8fd299 100644
--- a/gnome-panel/panel-toplevel.h
+++ b/gnome-panel/panel-toplevel.h
@@ -76,7 +76,7 @@ GType                panel_toplevel_get_type               (void) G_GNUC_CONST;
 
 PanelWidget         *panel_toplevel_get_panel_widget       (PanelToplevel       *toplevel);
 
-G_CONST_RETURN char *panel_toplevel_get_toplevel_id        (PanelToplevel       *toplevel);
+G_CONST_RETURN char *panel_toplevel_get_id                 (PanelToplevel       *toplevel);
 void                 panel_toplevel_set_name               (PanelToplevel       *toplevel,	
 							    const char          *name);
 G_CONST_RETURN char *panel_toplevel_get_name               (PanelToplevel       *toplevel);
diff --git a/gnome-panel/panel.c b/gnome-panel/panel.c
index a16b5bc..6784f00 100644
--- a/gnome-panel/panel.c
+++ b/gnome-panel/panel.c
@@ -613,7 +613,7 @@ drop_nautilus_desktop_uri (PanelWidget *panel,
 			return FALSE;
 
 	success = TRUE;
-	id = panel_toplevel_get_toplevel_id (panel->toplevel);
+	id = panel_toplevel_get_id (panel->toplevel);
 	basename = uri + strlen ("x-nautilus-desktop:///");
 
 	if (strncmp (basename, "trash", strlen ("trash")) == 0)
@@ -1340,7 +1340,7 @@ panel_is_applet_right_stick (GtkWidget *applet)
 static void
 panel_delete_without_query (PanelToplevel *toplevel)
 {
-	panel_layout_delete_toplevel (panel_toplevel_get_toplevel_id (toplevel));
+	panel_layout_delete_toplevel (panel_toplevel_get_id (toplevel));
 } 
 
 static void