Do not emit the TABS_CHANGED signal; the tab's egg action will itself take

2003-06-09  Christian Persch  <chpe@cvs.gnome.org>

* src/ephy-notebook.c: (ephy_notebook_set_page_title):

Do not emit the TABS_CHANGED signal; the tab's egg action will itself
take care of updating the menu entry.

* src/ephy-tab.h:
* src/eph-tab.c: (ephy_tab_set_property), (ephy_tab_get_property)
(ephy_tab_class_init):

Object properties for tab address, icon-address, load-progress,
load-status, message, security, title, window and zoom.

* src/ephy-tab.c: (ephy_tab_action_activate_cb), (ephy_tab_get_action),
(ephy_tab_init):

Augment the tab by an egg action for use in the tabs menu.

* src/ephy-tab.c: (ephy_tab_set_load_status),
(ephy_tab_set_link_message), (ephy_tab_set_favicon),
(ephy_tab_icon_cache_changed_cb), (ephy_tab_set_icon_address),
(ephy_get_icon_address), (ephy_tab_favicon_cb), (ephy_tab_address_cb),
(ephy_tab_title_cb), (build_net_state_message), (ensure_address),
(ephy_tab_net_state_cb), (ephy_tab_security_change_cb),
(ephy_tab_set_load_percent), (ephy_tab_get_load_percent),
(ephy_tab_get_status_message), (ephy_tab_set_title),
(ephy_tab_set_location), (ephy_tab_set_security_level),
(ephy_tab_get_security_level), (ephy_tab_set_zoom),
(ephy_tab_get_zoom):

Getters/setters for the tab's object properties. Use the setters in the
callbacks instead of setting the values directly.

* src/ephy-tabs-menu.c: (ephy_tabs_menu_set_action_accelerator),
(ephy_tabs_menu_update):

Use the tab's egg action directly instead of dummy egg actions.
This makes updating the tab titles in the tabs menu work
automagically.

1 files changed, 35 insertions, 27 deletions

diff --git a/src/ephy-tab.h b/src/ephy-tab.h
index 82f6d16a6..8b38e8f6d 100644
--- a/src/ephy-tab.h
+++ b/src/ephy-tab.h
@@ -20,8 +20,10 @@
 #define EPHY_TAB_H
 
 #include "ephy-embed.h"
+#include "egg-action.h"
 
 #include <glib-object.h>
+#include <gtk/gtkwidget.h>
 
 G_BEGIN_DECLS
 
@@ -32,17 +34,13 @@ typedef struct EphyTabClass EphyTabClass;
 #define EPHY_TAB_CLASS(klass)     (GTK_CHECK_CLASS_CAST ((klass), EPHY_TAB, EphyTabClass))
 #define IS_EPHY_TAB(obj)          (GTK_CHECK_TYPE ((obj), EPHY_TAB_TYPE))
 #define IS_EPHY_TAB_CLASS(klass)  (GTK_CHECK_CLASS_TYPE ((klass), EPHY_TAB))
+#define EPHY_TAB_GET_CLASS(obj)	  (G_TYPE_INSTANCE_GET_CLASS((obj), EPHY_TAB_TYPE, EphyTabClass))
 
 typedef struct EphyTab EphyTab;
 typedef struct EphyTabPrivate EphyTabPrivate;
 
 typedef enum
 {
-	TAB_CONTROL_TITLE
-} TabControlID;
-
-typedef enum
-{
 	TAB_LOAD_NONE,
 	TAB_LOAD_STARTED,
 	TAB_LOAD_COMPLETED
@@ -56,53 +54,63 @@ struct EphyTab
 
 struct EphyTabClass
 {
-        GObjectClass parent_class;
+	GObjectClass parent_class;
 };
 
 /* Include the header down here to resolve circular dependency */
 #include "ephy-window.h"
 
-GType         ephy_tab_get_type			(void);
+GType		ephy_tab_get_type		(void);
 
-EphyTab      *ephy_tab_new			(void);
+EphyTab	*	ephy_tab_new			(void);
 
-EphyEmbed    *ephy_tab_get_embed		(EphyTab *tab);
+EggAction * 	ephy_tab_get_action		(EphyTab *tab);
+
+EphyEmbed *	ephy_tab_get_embed		(EphyTab *tab);
+
+EphyEmbedEvent *ephy_tab_get_event		(EphyTab *tab);
 
-void          ephy_tab_set_window		(EphyTab *tab,
+void		ephy_tab_set_window		(EphyTab *tab,
 						 EphyWindow *window);
 
-EphyWindow   *ephy_tab_get_window		(EphyTab *tab);
+EphyWindow *	ephy_tab_get_window		(EphyTab *tab);
 
-void	      ephy_tab_set_is_active		(EphyTab *tab,
-						 gboolean is_active);
+const char *	ephy_tab_get_icon_address	(EphyTab *tab);
 
-gboolean      ephy_tab_get_is_active		(EphyTab *tab);
+void		ephy_tab_set_is_active		(EphyTab *tab,
+						 gboolean is_active);
 
-gboolean      ephy_tab_get_visibility           (EphyTab *tab);
+gboolean	ephy_tab_get_is_active		(EphyTab *tab);
 
-TabLoadStatus ephy_tab_get_load_status		(EphyTab *tab);
 
-int	      ephy_tab_get_load_percent		(EphyTab *tab);
+TabLoadStatus	ephy_tab_get_load_status	(EphyTab *tab);
 
-const char   *ephy_tab_get_status_message	(EphyTab *tab);
+const char *	ephy_tab_get_link_message	(EphyTab *tab);
 
-const char   *ephy_tab_get_title		(EphyTab *tab);
 
-const char   *ephy_tab_get_location             (EphyTab *tab);
+int		ephy_tab_get_load_percent	(EphyTab *tab);
 
-const char   *ephy_tab_get_favicon_url          (EphyTab *tab);
+void		ephy_tab_set_location		(EphyTab *tab,
+						 const char *location);
 
-void	      ephy_tab_set_location             (EphyTab *tab,
-						 char *location);
+const char *	ephy_tab_get_location		(EphyTab *tab);
+						 
+EmbedSecurityLevel	ephy_tab_get_security_level	(EphyTab *tab);
 
-void	      ephy_tab_get_size			(EphyTab *tab,
+void		ephy_tab_get_size		(EphyTab *tab,
 						 int *width,
 						 int *height);
 
-void	      ephy_tab_update_control		(EphyTab *tab,
-						 TabControlID id);
+const char *	ephy_tab_get_status_message	(EphyTab *tab);
 
-EphyEmbedEvent *ephy_tab_get_event		(EphyTab *tab);
+const char *	ephy_tab_get_title		(EphyTab *tab);
+
+void		ephy_tab_set_visibility		(EphyTab *tab,
+						 gboolean visible);
+
+gboolean	ephy_tab_get_visibility		(EphyTab *tab);
+
+float 		ephy_tab_get_zoom 		(EphyTab *tab);
 
 G_END_DECLS