No longer display the logout button in embedded mode
This commit is contained in:
parent
65139c208b
commit
e8d06851ea
|
@ -49,6 +49,11 @@ static GtkWidget * _logout_init(PanelApplet * applet)
|
|||
GtkWidget * ret;
|
||||
GtkWidget * image;
|
||||
|
||||
if(applet->helper->logout_dialog == NULL)
|
||||
{
|
||||
error_set_code(0, "%s", "logout: Logging out is disabled");
|
||||
return NULL;
|
||||
}
|
||||
ret = gtk_button_new();
|
||||
image = gtk_image_new_from_icon_name("gnome-logout",
|
||||
applet->helper->icon_size);
|
||||
|
|
|
@ -295,10 +295,13 @@ static void _on_clicked(GtkWidget * widget, gpointer data)
|
|||
g_signal_connect(G_OBJECT(menuitem), "activate", G_CALLBACK(_on_lock),
|
||||
data);
|
||||
gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
|
||||
menuitem = _main_menuitem("Logout...", "gnome-logout");
|
||||
g_signal_connect(G_OBJECT(menuitem), "activate", G_CALLBACK(_on_logout),
|
||||
data);
|
||||
gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
|
||||
if(main->helper->logout_dialog != NULL)
|
||||
{
|
||||
menuitem = _main_menuitem("Logout...", "gnome-logout");
|
||||
g_signal_connect(G_OBJECT(menuitem), "activate", G_CALLBACK(
|
||||
_on_logout), data);
|
||||
gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
|
||||
}
|
||||
menuitem = _main_menuitem("Shutdown...", "gnome-shutdown");
|
||||
g_signal_connect(G_OBJECT(menuitem), "activate", G_CALLBACK(
|
||||
_on_shutdown), data);
|
||||
|
|
|
@ -57,7 +57,9 @@ struct _Panel
|
|||
/* prototypes */
|
||||
/* helpers */
|
||||
static int _panel_helper_error(void * priv, char const * message, int ret);
|
||||
#ifndef EMBEDDED
|
||||
static int _panel_helper_logout_dialog(void);
|
||||
#endif
|
||||
static void _panel_helper_position_menu(GtkMenu * menu, gint * x, gint * y,
|
||||
gboolean * push_in, gpointer data);
|
||||
static int _panel_helper_shutdown_dialog(void);
|
||||
|
@ -90,7 +92,11 @@ Panel * panel_new(void)
|
|||
panel->helper.priv = panel;
|
||||
panel->helper.error = _panel_helper_error;
|
||||
panel->helper.icon_size = PANEL_ICON_SIZE;
|
||||
#ifndef EMBEDDED
|
||||
panel->helper.logout_dialog = _panel_helper_logout_dialog;
|
||||
#else
|
||||
panel->helper.logout_dialog = NULL;
|
||||
#endif
|
||||
panel->helper.position_menu = _panel_helper_position_menu;
|
||||
panel->helper.shutdown_dialog = _panel_helper_shutdown_dialog;
|
||||
/* root window */
|
||||
|
@ -266,6 +272,7 @@ static int _panel_helper_error(void * priv, char const * message, int ret)
|
|||
}
|
||||
|
||||
|
||||
#ifndef EMBEDDED
|
||||
/* panel_helper_logout_dialog */
|
||||
static int _panel_helper_logout_dialog(void)
|
||||
{
|
||||
|
@ -290,6 +297,7 @@ static int _panel_helper_logout_dialog(void)
|
|||
gtk_main_quit();
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
/* panel_helper_position_menu */
|
||||
|
|
Loading…
Reference in New Issue
Block a user