rpms/fast-user-switch-applet/devel fast-user-switch-applet-2.20.0-username.patch, NONE, 1.1 fast-user-switch-applet.spec, 1.17, 1.18
Matthias Clasen (mclasen)
fedora-extras-commits at redhat.com
Tue Sep 18 18:39:33 UTC 2007
Author: mclasen
Update of /cvs/extras/rpms/fast-user-switch-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16666
Modified Files:
fast-user-switch-applet.spec
Added Files:
fast-user-switch-applet-2.20.0-username.patch
Log Message:
fix up a patch
fast-user-switch-applet-2.20.0-username.patch:
--- NEW FILE fast-user-switch-applet-2.20.0-username.patch ---
diff -up fast-user-switch-applet-2.20.0/src/applet.c.username fast-user-switch-applet-2.20.0/src/applet.c
--- fast-user-switch-applet-2.20.0/src/applet.c.username 2007-09-18 09:33:33.000000000 -0400
+++ fast-user-switch-applet-2.20.0/src/applet.c 2007-09-18 14:30:33.000000000 -0400
@@ -237,6 +237,7 @@ static void sort_menu
static GladeXML *get_glade_xml (const gchar *root);
static void run_switch (FusaAppletData *adata,
FusaDisplay *display,
+ FusaUser *user,
gboolean use_xnest);
static void maybe_lock_screen (FusaAppletData *adata,
FusaDisplay *display);
@@ -1780,12 +1781,12 @@ user_item_activate_cb (GtkWidget *menuit
if (g_slist_length (unique_displays) > 1)
show_display_selector_dialog (adata, unique_displays);
else
- run_switch (adata, unique_displays->data, FALSE);
+ run_switch (adata, unique_displays->data, user, FALSE);
g_slist_free (unique_displays);
}
else
- run_switch (adata, displays->data, FALSE);
+ run_switch (adata, displays->data, user, FALSE);
g_slist_free (displays);
}
@@ -1801,7 +1802,7 @@ user_item_activate_cb (GtkWidget *menuit
/* Only one display open (this one), so create a new one */
if (g_slist_length (displays) == 1)
{
- run_switch (adata, NULL, use_xnest);
+ run_switch (adata, NULL, user, use_xnest);
g_slist_free (displays);
}
/* Iterate through to find an open display */
@@ -1815,7 +1816,7 @@ user_item_activate_cb (GtkWidget *menuit
if (!fusa_display_get_user (displays->data) &&
(use_xnest == !!fusa_display_get_nested (displays->data)))
{
- run_switch (adata, displays->data, FALSE);
+ run_switch (adata, displays->data, user, FALSE);
/* The pointer will be invalid but !NULL after this */
g_slist_free (displays);
break;
@@ -1825,7 +1826,7 @@ user_item_activate_cb (GtkWidget *menuit
}
if (!displays)
- run_switch (adata, NULL, use_xnest);
+ run_switch (adata, NULL, user, use_xnest);
}
}
}
@@ -1855,7 +1856,7 @@ login_screen_activate_cb (GtkMenuItem *i
}
g_slist_free (displays);
- run_switch (adata, target, FALSE);
+ run_switch (adata, target, NULL, FALSE);
}
static void
@@ -1891,7 +1892,7 @@ login_window_activate_cb (GtkMenuItem *i
}
else
{
- run_switch (adata, target, TRUE);
+ run_switch (adata, target, NULL, TRUE);
}
}
@@ -1962,6 +1963,7 @@ selector_dialog_response_cb (GtkWidget *
run_switch (res_data->adata,
g_object_get_data (G_OBJECT (rbuttons->data),
"fusa-applet-radio-display"),
+ NULL,
FALSE);
break;
}
@@ -2278,6 +2280,7 @@ get_glade_xml (const gchar *root)
static void
run_switch (FusaAppletData *adata,
FusaDisplay *display,
+ FusaUser *user,
gboolean use_xnest)
{
GdkScreen *screen;
@@ -2295,10 +2298,10 @@ run_switch (FusaAppletData *adata,
}
if (use_xnest)
- fusa_manager_new_xnest (adata->manager, screen,
+ fusa_manager_new_xnest (adata->manager, screen, user,
manager_new_xnest_cb, adata, NULL);
else
- fusa_manager_new_console (adata->manager, screen,
+ fusa_manager_new_console (adata->manager, screen, user,
manager_new_console_cb, adata, NULL);
}
diff -up fast-user-switch-applet-2.20.0/src/gdm-queue.h.username fast-user-switch-applet-2.20.0/src/gdm-queue.h
--- fast-user-switch-applet-2.20.0/src/gdm-queue.h.username 2007-09-18 14:31:40.000000000 -0400
+++ fast-user-switch-applet-2.20.0/src/gdm-queue.h 2007-09-18 14:36:48.000000000 -0400
@@ -35,7 +35,9 @@ G_BEGIN_DECLS
#define GDM_CMD_VERSION "VERSION"
#define GDM_CMD_AUTH_LOCAL "AUTH_LOCAL %s"
#define GDM_CMD_FLEXI_XSERVER "FLEXI_XSERVER"
+#define GDM_CMD_FLEXI_XSERVER_USER "FLEXI_XSERVER_USER %s"
#define GDM_CMD_FLEXI_XNEST "FLEXI_XNEST %s %d %s %s"
+#define GDM_CMD_FLEXI_XNEST_USER "FLEXI_XNEST_USER %s %s %d %s %s"
#define GDM_CMD_CONSOLE_SERVERS "CONSOLE_SERVERS"
#define GDM_CMD_GET_CONFIG "GET_CONFIG %s"
#define GDM_CMD_GET_CONFIG_FILE "GET_CONFIG_FILE"
diff -up fast-user-switch-applet-2.20.0/src/fusa-manager.h.username fast-user-switch-applet-2.20.0/src/fusa-manager.h
--- fast-user-switch-applet-2.20.0/src/fusa-manager.h.username 2007-09-18 09:33:33.000000000 -0400
+++ fast-user-switch-applet-2.20.0/src/fusa-manager.h 2007-09-18 14:30:33.000000000 -0400
@@ -107,11 +107,13 @@ void fusa_manager_activate_displ
GDestroyNotify notify);
void fusa_manager_new_console (FusaManager *manager,
GdkScreen *screen,
+ FusaUser *user,
FusaManagerDisplayCallback func,
gpointer data,
GDestroyNotify notify);
void fusa_manager_new_xnest (FusaManager *manager,
GdkScreen *screen,
+ FusaUser *user,
FusaManagerDisplayCallback func,
gpointer data,
GDestroyNotify notify);
diff -up fast-user-switch-applet-2.20.0/src/fusa-manager.c.username fast-user-switch-applet-2.20.0/src/fusa-manager.c
--- fast-user-switch-applet-2.20.0/src/fusa-manager.c.username 2007-09-18 09:33:33.000000000 -0400
+++ fast-user-switch-applet-2.20.0/src/fusa-manager.c 2007-09-18 14:30:33.000000000 -0400
@@ -1686,6 +1686,7 @@ fusa_manager_activate_display (FusaManag
void
fusa_manager_new_console (FusaManager *manager,
GdkScreen *screen,
+ FusaUser *user,
FusaManagerDisplayCallback func,
gpointer data,
GDestroyNotify notify)
@@ -1694,9 +1695,14 @@ fusa_manager_new_console (FusaManager
queue_authentication (screen);
- ask_gdm (gdm_callback_activate_display,
- new_fusa_manager_with_callback (manager, func, NULL, data),
- GDM_CMD_FLEXI_XSERVER);
+ if (user)
+ ask_gdm (gdm_callback_activate_display,
+ new_fusa_manager_with_callback (manager, func, NULL, data),
+ GDM_CMD_FLEXI_XSERVER_USER, fusa_user_get_user_name (user));
+ else
+ ask_gdm (gdm_callback_activate_display,
+ new_fusa_manager_with_callback (manager, func, NULL, data),
+ GDM_CMD_FLEXI_XSERVER);
}
/**
@@ -1710,6 +1716,7 @@ fusa_manager_new_console (FusaManager
void
fusa_manager_new_xnest (FusaManager *manager,
GdkScreen *screen,
+ FusaUser *user,
FusaManagerDisplayCallback func,
gpointer data,
GDestroyNotify notify)
@@ -1722,13 +1729,23 @@ fusa_manager_new_xnest (FusaManager
queue_authentication (screen);
- ask_gdm (gdm_callback_update_displays,
- new_fusa_manager_with_callback (manager, func, NULL, data),
- GDM_CMD_FLEXI_XNEST,
- gdk_display_get_name (gdk_screen_get_display (screen)),
- (int) getuid (),
- mit_cookie,
- XauFileName ());
+ if (user)
+ ask_gdm (gdm_callback_update_displays,
+ new_fusa_manager_with_callback (manager, func, NULL, data),
+ GDM_CMD_FLEXI_XNEST_USER,
+ fusa_user_get_user_name (user),
+ gdk_display_get_name (gdk_screen_get_display (screen)),
+ (int) getuid (),
+ mit_cookie,
+ XauFileName ());
+ else
+ ask_gdm (gdm_callback_update_displays,
+ new_fusa_manager_with_callback (manager, func, NULL, data),
+ GDM_CMD_FLEXI_XNEST,
+ gdk_display_get_name (gdk_screen_get_display (screen)),
+ (int) getuid (),
+ mit_cookie,
+ XauFileName ());
g_free (mit_cookie);
Index: fast-user-switch-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/fast-user-switch-applet/devel/fast-user-switch-applet.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- fast-user-switch-applet.spec 18 Sep 2007 16:45:18 -0000 1.17
+++ fast-user-switch-applet.spec 18 Sep 2007 18:39:00 -0000 1.18
@@ -6,7 +6,7 @@
License: GPLv2+
Source0: ftp://download.gnome.org/sources/fast-user-switch-applet/2.18/fast-user-switch-applet-%{version}.tar.bz2
# http://bugzilla.gnome.org/show_bug.cgi?id=402475
-Patch0: fast-user-switch-applet-2.17.3-username.patch
+Patch0: fast-user-switch-applet-2.20.0-username.patch
Patch1: fast-user-switch-applet-2.17.3-defaults.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=421080
Patch2: startx.patch
More information about the fedora-extras-commits
mailing list