aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKen VanDine <ken.vandine@canonical.com>2011-08-30 15:29:34 -0400
committerKen VanDine <ken.vandine@canonical.com>2011-08-30 15:29:34 -0400
commitc0553de90eb81bbfa300955504ea0d0b84795018 (patch)
tree5fe0225420bc7297d201728e880c190ed7fb5660
parent455e7e483041b4641522a477ba00ca720b3a519c (diff)
parent6ee7c05f5d8f4397c3111fe94ab7c742478b737e (diff)
downloadayatana-indicator-session-c0553de90eb81bbfa300955504ea0d0b84795018.tar.gz
ayatana-indicator-session-c0553de90eb81bbfa300955504ea0d0b84795018.tar.bz2
ayatana-indicator-session-c0553de90eb81bbfa300955504ea0d0b84795018.zip
Import upstream version 0.3.4
-rw-r--r--ChangeLog36
-rwxr-xr-xconfigure2
-rw-r--r--configure.ac2
-rw-r--r--src/udev-mgr.c17
-rw-r--r--src/user-menu-mgr.c36
5 files changed, 60 insertions, 33 deletions
diff --git a/ChangeLog b/ChangeLog
index 2d038ca..dc8489b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,41 @@
# Generated by Makefile. Do not edit.
+2011-08-30 Conor Curran <conor.curran@canonical.com>
+
+ bump for release
+
+2011-08-30 Conor Curran <conor.curran@canonical.com>
+
+ merge the guest fixes
+
+2011-08-30 Conor Curran <conor.curran@canonical.com>
+
+ remove guest checking in generic user list, the guest user is never included in the user list returned therefore the check is pointless
+
+2011-08-30 Conor Curran <conor.curran@canonical.com>
+
+ remove broken logic concerned with displaying the user menu
+
+2011-08-30 Conor Curran <conor.curran@canonical.com>
+
+ fixed the guest session panel string
+
+2011-08-30 Conor Curran <conor.curran@canonical.com>
+
+ bump for release
+
+2011-08-30 Conor Curran <conor.curran@canonical.com>
+
+ protect against incorrect webcam detection
+
+2011-08-26 Conor Curran <conor.curran@canonical.com>
+
+ merge in translation fix
+
+2011-08-26 Conor Curran <conor.curran@canonical.com>
+
+ fixed the translation bug
+
2011-08-25 Conor Curran <conor.curran@canonical.com>
ted's str allocation fixes
diff --git a/configure b/configure
index 9bc0aba..9d9e6f6 100755
--- a/configure
+++ b/configure
@@ -2745,7 +2745,7 @@ fi
# Define the identity of the package.
PACKAGE=indicator-session
- VERSION=0.3.3.2
+ VERSION=0.3.4
cat >>confdefs.h <<_ACEOF
diff --git a/configure.ac b/configure.ac
index 8e5ed8b..a2f96f5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ AC_INIT(src/indicator-session.c)
AC_PREREQ(2.53)
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(indicator-session, 0.3.3.2)
+AM_INIT_AUTOMAKE(indicator-session, 0.3.4)
AM_MAINTAINER_MODE
diff --git a/src/udev-mgr.c b/src/udev-mgr.c
index edc2262..5f197d6 100644
--- a/src/udev-mgr.c
+++ b/src/udev-mgr.c
@@ -226,7 +226,11 @@ udev_mgr_handle_webcam (UdevMgr* self,
vendor = g_udev_device_get_property (device, "ID_VENDOR_ID");
product = g_udev_device_get_property (device, "ID_MODEL_ID");
-
+
+ if (!vendor || !product) {
+ return;
+ }
+
if (action == REMOVE){
if (g_hash_table_lookup (self->webcams_present, product) == NULL){
g_warning ("Got a remove event on a webcam device but we don't have that device in our webcam cache");
@@ -316,18 +320,23 @@ static void udev_mgr_handle_scsi_device (UdevMgr* self,
{
const gchar* type = NULL;
type = g_udev_device_get_property (device, "TYPE");
- // apparently anything thats type 3 and SCSI is a Scanner
+
+ if (!type) {
+ return;
+ }
+
+ // apparently anything thats type 6 and SCSI is a Scanner
if (g_strcmp0 (type, "6") == 0 && action == ADD){
const gchar* manufacturer = NULL;
manufacturer = g_udev_device_get_property (device, "ID_VENDOR");
if (manufacturer != NULL){
- gchar * label = format_device_name(self, manufacturer, _("Scanner"), _("%s Scanner"));
+ gchar * label = format_device_name(self, manufacturer, _("Scanner"), _("%s Scanner"));
dbusmenu_menuitem_property_set (self->scanner_item,
DBUSMENU_MENUITEM_PROP_LABEL,
label);
- g_free(label);
+ g_free(label);
}
gchar* random_scanner_name = g_strdup_printf("%p--scanner", self);
diff --git a/src/user-menu-mgr.c b/src/user-menu-mgr.c
index 1b404d3..a4308dd 100644
--- a/src/user-menu-mgr.c
+++ b/src/user-menu-mgr.c
@@ -168,6 +168,10 @@ user_menu_mgr_rebuild_items (UserMenuMgr *self, gboolean greeter_mode)
users_service_dbus_set_guest_item (self->users_dbus_interface,
guest_mi);
}
+ else{
+ session_dbus_set_users_real_name (self->session_dbus_interface,
+ _("Guest"));
+ }
GList * users = NULL;
users = users_service_dbus_get_user_list (self->users_dbus_interface);
@@ -176,7 +180,7 @@ user_menu_mgr_rebuild_items (UserMenuMgr *self, gboolean greeter_mode)
gboolean user_menu_is_visible = FALSE;
if (!greeter_mode){
- user_menu_is_visible = self->user_count > 1 || check_guest_session();
+ user_menu_is_visible = TRUE;
}
session_dbus_set_user_menu_visibility (self->session_dbus_interface,
@@ -188,37 +192,15 @@ user_menu_mgr_rebuild_items (UserMenuMgr *self, gboolean greeter_mode)
for (u = users; u != NULL; u = g_list_next (u)) {
user = u->data;
- //g_debug ("%p: %s", user, user->real_name);
+ g_debug ("%s: %s", user->user_name, user->real_name);
user->service = self->users_dbus_interface;
gboolean current_user = g_strcmp0 (user->user_name, g_get_user_name()) == 0;
if (current_user == TRUE){
- if (check_guest_session()){
- g_debug ("about to set the users real name to %s for user %s",
- user->real_name, user->user_name);
- session_dbus_set_users_real_name (self->session_dbus_interface, user->real_name);
- }
- else{
- g_debug ("about to set the users real name to GUEST");
- session_dbus_set_users_real_name (self->session_dbus_interface,
- _("Guest"));
- }
+ g_debug ("about to set the users real name to %s for user %s",
+ user->real_name, user->user_name);
+ session_dbus_set_users_real_name (self->session_dbus_interface, user->real_name);
}
-
- if (g_strcmp0(user->user_name, "guest") == 0) {
- /* Check to see if the guest has sessions and so therefore should
- get a check mark. */
- dbusmenu_menuitem_property_set_bool (guest_mi,
- USER_ITEM_PROP_LOGGED_IN,
- user->sessions != NULL);
- /* If we're showing user accounts, keep going through the list */
- if (self->user_count > MINIMUM_USERS && self->user_count < MAXIMUM_USERS) {
- continue;
- }
- /* If not, we can stop here */
- break;
- }
-
if (self->user_count > MINIMUM_USERS && self->user_count < MAXIMUM_USERS) {
mi = dbusmenu_menuitem_new ();
dbusmenu_menuitem_property_set (mi,