GNOME.org
 

[gnome-panel/bonobo-less] Rename PANEL_OBJECT_BONOBO as PANEL_OBJECT_APPLET

commit f03b5a779103d32fda703697c2605966dce812c5
Author: Carlos Garcia Campos <carlosgc gnome org>
Date:   Fri Feb 26 14:53:36 2010 +0100

    Rename PANEL_OBJECT_BONOBO as PANEL_OBJECT_APPLET

 gnome-panel/applet.c              |   26 +++++++++++++-------------
 gnome-panel/panel-applet-frame.c  |    4 ++--
 gnome-panel/panel-compatibility.c |    2 +-
 gnome-panel/panel-enums.h         |    2 +-
 gnome-panel/panel-profile.c       |   10 +++++-----
 gnome-panel/panel-widget.c        |    2 +-
 gnome-panel/panel.c               |    6 +++---
 7 files changed, 26 insertions(+), 26 deletions(-)
---
diff --git a/gnome-panel/applet.c b/gnome-panel/applet.c
index 3aa9e68..2391d1a 100644
--- a/gnome-panel/applet.c
+++ b/gnome-panel/applet.c
@@ -57,7 +57,7 @@ panel_applet_set_dnd_enabled (AppletInfo *info,
 	case PANEL_OBJECT_LAUNCHER:
 		panel_launcher_set_dnd_enabled (info->data, dnd_enabled);
 		break;
-	case PANEL_OBJECT_BONOBO:
+	case PANEL_OBJECT_APPLET:
 		break;
 	case PANEL_OBJECT_LOGOUT:
 	case PANEL_OBJECT_LOCK:
@@ -194,7 +194,7 @@ panel_applet_locked_change_notify (GConfClient *client,
 
 	panel_applet_toggle_locked (info);
 
-	if (info->type == PANEL_OBJECT_BONOBO)
+	if (info->type == PANEL_OBJECT_APPLET)
 		panel_applet_frame_sync_menu_state (PANEL_APPLET_FRAME (info->widget));
 	else
 		panel_applet_recreate_menu (info);
@@ -268,7 +268,7 @@ applet_callback_callback (GtkWidget      *widget,
 			PANEL_MENU_BAR (menu->info->widget), menu->name);
 		break;
 
-	case PANEL_OBJECT_BONOBO:
+	case PANEL_OBJECT_APPLET:
 		/*
 		 * Applet's menu's are handled differently
 		 */
@@ -692,7 +692,7 @@ applet_do_popup_menu (GtkWidget      *widget,
 	if (panel_applet_is_in_drag ())
 		return FALSE;
 
-	if (info->type == PANEL_OBJECT_BONOBO)
+	if (info->type == PANEL_OBJECT_APPLET)
 		return FALSE;
 
 	applet_show_menu (info, event);
@@ -753,7 +753,7 @@ panel_applet_destroy (GtkWidget  *widget,
 		}
 	}
 
-	if (info->type != PANEL_OBJECT_BONOBO)
+	if (info->type != PANEL_OBJECT_APPLET)
 		panel_lockdown_notify_remove (G_CALLBACK (panel_applet_recreate_menu),
 					      info);
 
@@ -919,7 +919,7 @@ panel_applet_load_idle_handler (gpointer dummy)
 	}
 
 	switch (applet->type) {
-	case PANEL_OBJECT_BONOBO:
+	case PANEL_OBJECT_APPLET:
 		panel_applet_frame_load_from_gconf (
 					panel_widget,
 					applet->locked,
@@ -983,7 +983,7 @@ panel_applet_load_idle_handler (gpointer dummy)
 	}
 
 	/* Only the bonobo applets will do a late stop_loading */
-	if (applet->type != PANEL_OBJECT_BONOBO)
+	if (applet->type != PANEL_OBJECT_APPLET)
 		panel_applet_stop_loading (applet->id);
 
 	return TRUE;
@@ -1135,7 +1135,7 @@ panel_applet_save_position (AppletInfo *applet_info,
 
 	client  = panel_gconf_get_client ();
 
-	key_type = applet_info->type == PANEL_OBJECT_BONOBO ? PANEL_GCONF_APPLETS : PANEL_GCONF_OBJECTS;
+	key_type = applet_info->type == PANEL_OBJECT_APPLET ? PANEL_GCONF_APPLETS : PANEL_GCONF_OBJECTS;
 	
 	panel_widget = PANEL_WIDGET (applet_info->widget->parent);
 
@@ -1277,11 +1277,11 @@ panel_applet_register (GtkWidget       *applet,
 
 	g_object_set_data (G_OBJECT (applet), "applet_info", info);
 
-	if (type != PANEL_OBJECT_BONOBO)
+	if (type != PANEL_OBJECT_APPLET)
 		panel_lockdown_notify_add (G_CALLBACK (panel_applet_recreate_menu),
 					   info);
 
-	key = panel_gconf_full_key ((type == PANEL_OBJECT_BONOBO) ?
+	key = panel_gconf_full_key ((type == PANEL_OBJECT_APPLET) ?
 				     PANEL_GCONF_APPLETS : PANEL_GCONF_OBJECTS,
 				    id, "locked");
 	panel_gconf_notify_add_while_alive (key,
@@ -1347,7 +1347,7 @@ panel_applet_register (GtkWidget       *applet,
 	size_change (info, panel);
 	back_change (info, panel);
 
-	if (type != PANEL_OBJECT_BONOBO)
+	if (type != PANEL_OBJECT_APPLET)
 		gtk_widget_grab_focus (applet);
 	else
 		gtk_widget_child_focus (applet, GTK_DIR_TAB_FORWARD);
@@ -1380,7 +1380,7 @@ panel_applet_can_freely_move (AppletInfo *applet)
 
 	client  = panel_gconf_get_client ();
 	
-	key_type = (applet->type == PANEL_OBJECT_BONOBO) ? PANEL_GCONF_APPLETS : PANEL_GCONF_OBJECTS;
+	key_type = (applet->type == PANEL_OBJECT_APPLET) ? PANEL_GCONF_APPLETS : PANEL_GCONF_OBJECTS;
        
 	key = panel_gconf_full_key (key_type, applet->id, "position");
 	if (!gconf_client_key_is_writable (client, key, NULL))
@@ -1409,7 +1409,7 @@ panel_applet_lockable (AppletInfo *applet)
 	
 	client  = panel_gconf_get_client ();
 	
-	key_type = (applet->type == PANEL_OBJECT_BONOBO) ? PANEL_GCONF_APPLETS : PANEL_GCONF_OBJECTS;
+	key_type = (applet->type == PANEL_OBJECT_APPLET) ? PANEL_GCONF_APPLETS : PANEL_GCONF_OBJECTS;
 
 	key = panel_gconf_full_key (key_type, applet->id, "locked");
 
diff --git a/gnome-panel/panel-applet-frame.c b/gnome-panel/panel-applet-frame.c
index 686eb3b..41f4189 100644
--- a/gnome-panel/panel-applet-frame.c
+++ b/gnome-panel/panel-applet-frame.c
@@ -336,7 +336,7 @@ panel_applet_frame_activated (PanelAppletContainer       *container,
 	info = panel_applet_register (GTK_WIDGET (frame), GTK_WIDGET (frame),
 				      NULL, frame->priv->panel,
 				      frame_act->locked, frame_act->position,
-				      frame_act->exactpos, PANEL_OBJECT_BONOBO,
+				      frame_act->exactpos, PANEL_OBJECT_APPLET,
 				      frame_act->id);
 	frame->priv->applet_info = info;
 
@@ -459,7 +459,7 @@ panel_applet_frame_create (PanelToplevel *toplevel,
 
 	client =  panel_gconf_get_client ();
 
-	id = panel_profile_prepare_object (PANEL_OBJECT_BONOBO, toplevel, position, FALSE);
+	id = panel_profile_prepare_object (PANEL_OBJECT_APPLET, toplevel, position, FALSE);
 
 	key = panel_gconf_full_key (PANEL_GCONF_APPLETS, id, "applet_iid");
 	gconf_client_set_string (client, key, iid, NULL);
diff --git a/gnome-panel/panel-compatibility.c b/gnome-panel/panel-compatibility.c
index 8fdc9e7..5071ffd 100644
--- a/gnome-panel/panel-compatibility.c
+++ b/gnome-panel/panel-compatibility.c
@@ -537,7 +537,7 @@ panel_compatibility_migrate_menu_panel_settings (GConfClient *client,
 	g_free (id);
 
 	/* window menu on far left corner */
-        id = panel_profile_prepare_object_with_id (PANEL_OBJECT_BONOBO, toplevel_id, 0, TRUE);
+        id = panel_profile_prepare_object_with_id (PANEL_OBJECT_APPLET, toplevel_id, 0, TRUE);
 
 	key = panel_gconf_full_key (PANEL_GCONF_APPLETS, id, "bonobo_iid");
         gconf_client_set_string (client, key, "OAFIID:GNOME_WindowMenuApplet", NULL);
diff --git a/gnome-panel/panel-enums.h b/gnome-panel/panel-enums.h
index 5ebd367..019d1dc 100644
--- a/gnome-panel/panel-enums.h
+++ b/gnome-panel/panel-enums.h
@@ -78,7 +78,7 @@ typedef enum {
 	PANEL_OBJECT_DRAWER,
 	PANEL_OBJECT_MENU,
 	PANEL_OBJECT_LAUNCHER,
-	PANEL_OBJECT_BONOBO,
+	PANEL_OBJECT_APPLET,
 	PANEL_OBJECT_ACTION,
 	PANEL_OBJECT_MENU_BAR,
 	PANEL_OBJECT_SEPARATOR,
diff --git a/gnome-panel/panel-profile.c b/gnome-panel/panel-profile.c
index d4fe289..c3de4f1 100644
--- a/gnome-panel/panel-profile.c
+++ b/gnome-panel/panel-profile.c
@@ -99,7 +99,7 @@ static GConfEnumStringPair panel_object_type_map [] = {
 	{ PANEL_OBJECT_DRAWER,    "drawer-object" },
 	{ PANEL_OBJECT_MENU,      "menu-object" },
 	{ PANEL_OBJECT_LAUNCHER,  "launcher-object" },
-	{ PANEL_OBJECT_BONOBO,    "bonobo-applet" },
+	{ PANEL_OBJECT_APPLET,    "bonobo-applet" },
 	{ PANEL_OBJECT_ACTION,    "action-applet" },
 	{ PANEL_OBJECT_MENU_BAR,  "menu-bar" },
 	{ PANEL_OBJECT_SEPARATOR, "separator" },
@@ -1870,7 +1870,7 @@ panel_profile_prepare_object_with_id (PanelObjectType  object_type,
 	char              *id;
 	char              *dir;
 
-	key_type = (object_type == PANEL_OBJECT_BONOBO) ? PANEL_GCONF_APPLETS : PANEL_GCONF_OBJECTS;
+	key_type = (object_type == PANEL_OBJECT_APPLET) ? PANEL_GCONF_APPLETS : PANEL_GCONF_OBJECTS;
 
 	client  = panel_gconf_get_client ();
 
@@ -1919,7 +1919,7 @@ panel_profile_delete_object (AppletInfo *applet_info)
 	PanelGConfKeyType  type;
 	const char        *id;
 
-	type = (applet_info->type) == PANEL_OBJECT_BONOBO ? PANEL_GCONF_APPLETS :
+	type = (applet_info->type) == PANEL_OBJECT_APPLET ? PANEL_GCONF_APPLETS :
 							    PANEL_GCONF_OBJECTS;
 	id = panel_applet_get_id (applet_info);
 
@@ -2218,8 +2218,8 @@ panel_profile_object_id_list_update (GConfClient       *client,
 	for (l = existing_applets; l; l = l->next) {
 		AppletInfo *info = l->data;
 
-		if ((type == PANEL_GCONF_APPLETS && info->type == PANEL_OBJECT_BONOBO) ||
-		    (type == PANEL_GCONF_OBJECTS && info->type != PANEL_OBJECT_BONOBO))
+		if ((type == PANEL_GCONF_APPLETS && info->type == PANEL_OBJECT_APPLET) ||
+		    (type == PANEL_GCONF_OBJECTS && info->type != PANEL_OBJECT_APPLET))
 			sublist = g_slist_prepend (sublist, info);
 	}
 
diff --git a/gnome-panel/panel-widget.c b/gnome-panel/panel-widget.c
index 02babf7..dd2549e 100644
--- a/gnome-panel/panel-widget.c
+++ b/gnome-panel/panel-widget.c
@@ -2584,7 +2584,7 @@ panel_widget_reparent (PanelWidget *old_panel,
 		focus_widget = gtk_window_get_focus (GTK_WINDOW (old_panel->toplevel));
 	gtk_widget_reparent (applet, GTK_WIDGET (new_panel));
 
-	if (info && info->type == PANEL_OBJECT_BONOBO)
+	if (info && info->type == PANEL_OBJECT_APPLET)
 		panel_applet_frame_set_panel (PANEL_APPLET_FRAME (ad->applet), new_panel);
 
 	if (GTK_WIDGET_CAN_FOCUS (new_panel))
diff --git a/gnome-panel/panel.c b/gnome-panel/panel.c
index 18b9cb5..e6212d8 100644
--- a/gnome-panel/panel.c
+++ b/gnome-panel/panel.c
@@ -68,7 +68,7 @@ orientation_change (AppletInfo  *info,
 	orientation = panel_widget_get_applet_orientation (panel);
 
 	switch (info->type) {
-	case PANEL_OBJECT_BONOBO:
+	case PANEL_OBJECT_APPLET:
 		panel_applet_frame_change_orientation (
 				PANEL_APPLET_FRAME (info->widget), orientation);
 		break;
@@ -128,7 +128,7 @@ void
 size_change (AppletInfo  *info,
 	     PanelWidget *panel)
 {
-	if (info->type == PANEL_OBJECT_BONOBO)
+	if (info->type == PANEL_OBJECT_APPLET)
 		panel_applet_frame_change_size (
 			PANEL_APPLET_FRAME (info->widget), panel->sz);
 }
@@ -155,7 +155,7 @@ back_change (AppletInfo  *info,
 	     PanelWidget *panel)
 {
 	switch (info->type) {
-	case PANEL_OBJECT_BONOBO:
+	case PANEL_OBJECT_APPLET:
 		panel_applet_frame_change_background (
 			PANEL_APPLET_FRAME (info->widget), panel->background.type);
 		break;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]