0080-Fix-typo-in-error-message.patch

   1 From 3b4815eeb2b0edc7e8f24a453feddf069bbea3bc Mon Sep 17 00:00:00 2001
   2 From: Ian <ifreecarve@gmail.com>
   3 Date: Sun, 11 Aug 2013 22:34:57 +0200
   4 Subject: [PATCH 080/219] Fix typo in error message.
   5
   6 ---
   7  src/xfpm-manager.c | 180 ++++++++++++++++++++++++++---------------------------
   8  1 file changed, 90 insertions(+), 90 deletions(-)
   9
  10 diff --git a/src/xfpm-manager.c b/src/xfpm-manager.c
  11 index 472ee3e..853d78c 100644
  12 --- a/src/xfpm-manager.c
  13 +++ b/src/xfpm-manager.c
  14 @@ -73,9 +73,9 @@ static gboolean xfpm_manager_quit (XfpmManager *manager);
  15  struct XfpmManagerPrivate
  16  {
  17      DBusGConnection *session_bus;
  18 -
  19 +
  20      XfceSMClient    *client;
  21 -
  22 +
  23      XfpmPower       *power;
  24      XfpmButton      *button;
  25      XfpmXfconf      *conf;
  26 @@ -90,7 +90,7 @@ struct XfpmManagerPrivate
  27  #endif
  28
  29      GTimer         *timer;
  30 -
  31 +
  32      gboolean        inhibited;
  33      gboolean        session_managed;
  34  };
  35 @@ -113,7 +113,7 @@ xfpm_manager_init (XfpmManager *manager)
  36      manager->priv = XFPM_MANAGER_GET_PRIVATE (manager);
  37
  38      manager->priv->timer = g_timer_new ();
  39 -
  40 +
  41      notify_init ("xfce4-power-manager");
  42  }
  43
  44 @@ -126,7 +126,7 @@ xfpm_manager_finalize (GObject *object)
  45
  46      if ( manager->priv->session_bus )
  47         dbus_g_connection_unref (manager->priv->session_bus);
  48 -
  49 +
  50      g_object_unref (manager->priv->power);
  51      g_object_unref (manager->priv->button);
  52      g_object_unref (manager->priv->conf);
  53 @@ -136,15 +136,15 @@ xfpm_manager_finalize (GObject *object)
  54      g_object_unref (manager->priv->disks);
  55      g_object_unref (manager->priv->inhibit);
  56      g_object_unref (manager->priv->idle);
  57 -
  58 +
  59      g_timer_destroy (manager->priv->timer);
  60 -
  61 +
  62  #ifdef HAVE_DPMS
  63      g_object_unref (manager->priv->dpms);
  64  #endif
  65 -
  66 +
  67      g_object_unref (manager->priv->backlight);
  68 -
  69 +
  70      G_OBJECT_CLASS (xfpm_manager_parent_class)->finalize (object);
  71  }
  72
  73 @@ -162,7 +162,7 @@ static gboolean
  74  xfpm_manager_quit (XfpmManager *manager)
  75  {
  76      XFPM_DEBUG ("Exiting");
  77 -
  78 +
  79      xfpm_manager_release_names (manager);
  80      gtk_main_quit ();
  81      return TRUE;
  82 @@ -188,10 +188,10 @@ xfpm_manager_reserve_names (XfpmManager *manager)
  83                                   "org.freedesktop.PowerManagement") )
  84      {
  85         g_warning ("Unable to reserve bus name: Maybe any already running instance?\n");
  86 -
  87 +
  88         g_object_unref (G_OBJECT (manager));
  89         gtk_main_quit ();
  90 -
  91 +
  92         return FALSE;
  93      }
  94      return TRUE;
  95 @@ -202,7 +202,7 @@ xfpm_manager_shutdown (XfpmManager *manager)
  96  {
  97      GError *error = NULL;
  98      xfpm_console_kit_shutdown (manager->priv->console, &error );
  99 -
 100 +
 101      if ( error )
 102      {
 103         g_warning ("Failed to shutdown the system : %s", error->message);
 104 @@ -255,12 +255,12 @@ static void
 105  xfpm_manager_button_pressed_cb (XfpmButton *bt, XfpmButtonKey type, XfpmManager *manager)
 106  {
 107      XfpmShutdownRequest req = XFPM_DO_NOTHING;
 108 -
 109 +
 110      XFPM_DEBUG_ENUM (type, XFPM_TYPE_BUTTON_KEY, "Received button press event");
 111 -
 112 +
 113      if ( type == BUTTON_MON_BRIGHTNESS_DOWN || type == BUTTON_MON_BRIGHTNESS_UP )
 114          return;
 115 -
 116 +
 117      if ( type == BUTTON_POWER_OFF )
 118      {
 119          g_object_get (G_OBJECT (manager->priv->conf),
 120 @@ -285,7 +285,7 @@ xfpm_manager_button_pressed_cb (XfpmButton *bt, XfpmButtonKey type, XfpmManager
 121      }
 122
 123      XFPM_DEBUG_ENUM (req, XFPM_TYPE_SHUTDOWN_REQUEST, "Shutdown request : ");
 124 -
 125 +
 126      if ( req == XFPM_ASK )
 127         xfpm_manager_ask_shutdown (manager);
 128      else
 129 @@ -303,11 +303,11 @@ xfpm_manager_lid_changed_cb (XfpmPower *power, gboolean lid_is_closed, XfpmManag
 130  {
 131      XfpmLidTriggerAction action;
 132      gboolean on_battery;
 133 -
 134 +
 135      g_object_get (G_OBJECT (power),
 136                   "on-battery", &on_battery,
 137                   NULL);
 138 -
 139 +
 140      g_object_get (G_OBJECT (manager->priv->conf),
 141                   on_battery ? LID_SWITCH_ON_BATTERY_CFG : LID_SWITCH_ON_AC_CFG, &action,
 142                   NULL);
 143 @@ -315,7 +315,7 @@ xfpm_manager_lid_changed_cb (XfpmPower *power, gboolean lid_is_closed, XfpmManag
 144      if ( lid_is_closed )
 145      {
 146         XFPM_DEBUG_ENUM (action, XFPM_TYPE_LID_TRIGGER_ACTION, "LID close event");
 147 -
 148 +
 149         if ( action == LID_TRIGGER_NOTHING )
 150         {
 151  #ifdef HAVE_DPMS
 152 @@ -328,16 +328,16 @@ xfpm_manager_lid_changed_cb (XfpmPower *power, gboolean lid_is_closed, XfpmManag
 153             if ( !xfpm_is_multihead_connected () )
 154                 xfpm_lock_screen ();
 155         }
 156 -       else
 157 +       else
 158         {
 159             /*
 160              * Force sleep here as lid is closed and no point of asking the
 161              * user for confirmation in case of an application is inhibiting
 162 -            * the power manager.
 163 +            * the power manager.
 164              */
 165             xfpm_manager_sleep_request (manager, action, TRUE);
 166         }
 167 -
 168 +
 169      }
 170      else
 171      {
 172 @@ -359,34 +359,34 @@ xfpm_manager_alarm_timeout_cb (EggIdletime *idle, guint id, XfpmManager *manager
 173  {
 174      if (xfpm_power_get_mode (manager->priv->power) == XFPM_POWER_MODE_PRESENTATION)
 175         return;
 176 -
 177 +
 178      XFPM_DEBUG ("Alarm inactivity timeout id %d", id);
 179 -
 180 +
 181      if ( id == TIMEOUT_INACTIVITY_ON_AC || id == TIMEOUT_INACTIVITY_ON_BATTERY )
 182      {
 183         XfpmShutdownRequest req = XFPM_DO_NOTHING;
 184         gchar *sleep_mode;
 185         gboolean on_battery;
 186 -
 187 +
 188         if ( manager->priv->inhibited )
 189         {
 190             XFPM_DEBUG ("Idle sleep alarm timeout, but power manager is currently inhibited, action ignored");
 191             return;
 192         }
 193 -
 194 +
 195         g_object_get (G_OBJECT (manager->priv->conf),
 196                       INACTIVITY_SLEEP_MODE, &sleep_mode,
 197                       NULL);
 198 -
 199 +
 200         g_object_get (G_OBJECT (manager->priv->power),
 201                       "on-battery", &on_battery,
 202                       NULL);
 203 -
 204 +
 205         if ( !g_strcmp0 (sleep_mode, "Suspend") )
 206             req = XFPM_DO_SUSPEND;
 207         else
 208             req = XFPM_DO_HIBERNATE;
 209 -
 210 +
 211         g_free (sleep_mode);
 212
 213         if ( id == TIMEOUT_INACTIVITY_ON_AC && on_battery == FALSE )
 214 @@ -400,18 +400,18 @@ static void
 215  xfpm_manager_set_idle_alarm_on_ac (XfpmManager *manager)
 216  {
 217      guint on_ac;
 218 -
 219 +
 220      g_object_get (G_OBJECT (manager->priv->conf),
 221                   ON_AC_INACTIVITY_TIMEOUT, &on_ac,
 222                   NULL);
 223 -
 224 +
 225  #ifdef DEBUG
 226      if ( on_ac == 14 )
 227         TRACE ("setting inactivity sleep timeout on ac to never");
 228      else
 229         TRACE ("setting inactivity sleep timeout on ac to %d", on_ac);
 230  #endif
 231 -
 232 +
 233      if ( on_ac == 14 )
 234      {
 235         egg_idletime_alarm_remove (manager->priv->idle, TIMEOUT_INACTIVITY_ON_AC );
 236 @@ -426,18 +426,18 @@ static void
 237  xfpm_manager_set_idle_alarm_on_battery (XfpmManager *manager)
 238  {
 239      guint on_battery;
 240 -
 241 +
 242      g_object_get (G_OBJECT (manager->priv->conf),
 243                   ON_BATTERY_INACTIVITY_TIMEOUT, &on_battery,
 244                   NULL);
 245 -
 246 +
 247  #ifdef DEBUG
 248      if ( on_battery == 14 )
 249         TRACE ("setting inactivity sleep timeout on battery to never");
 250      else
 251         TRACE ("setting inactivity sleep timeout on battery to %d", on_battery);
 252  #endif
 253 -
 254 +
 255      if ( on_battery == 14 )
 256      {
 257         egg_idletime_alarm_remove (manager->priv->idle, TIMEOUT_INACTIVITY_ON_BATTERY );
 258 @@ -459,7 +459,7 @@ xfpm_manager_set_idle_alarm (XfpmManager *manager)
 259  {
 260      xfpm_manager_set_idle_alarm_on_ac (manager);
 261      xfpm_manager_set_idle_alarm_on_battery (manager);
 262 -
 263 +
 264  }
 265
 266  XfpmManager *
 267 @@ -468,18 +468,18 @@ xfpm_manager_new (DBusGConnection *bus, const gchar *client_id)
 268      XfpmManager *manager = NULL;
 269      GError *error = NULL;
 270      gchar *current_dir;
 271 -
 272 +
 273      const gchar *restart_command[] =
 274      {
 275         "xfce4-power-manager",
 276         "--restart",
 277         NULL
 278      };
 279 -
 280 +
 281      manager = g_object_new (XFPM_TYPE_MANAGER, NULL);
 282
 283      manager->priv->session_bus = bus;
 284 -
 285 +
 286      current_dir = g_get_current_dir ();
 287      manager->priv->client = xfce_sm_client_get_full (XFCE_SM_CLIENT_RESTART_NORMAL,
 288                                                      XFCE_SM_CLIENT_PRIORITY_DEFAULT,
 289 @@ -487,14 +487,14 @@ xfpm_manager_new (DBusGConnection *bus, const gchar *client_id)
 290                                                      current_dir,
 291                                                      restart_command,
 292                                                      SYSCONFDIR "/xdg/autostart/" PACKAGE_NAME ".desktop");
 293 -
 294 +
 295      g_free (current_dir);
 296 -
 297 +
 298      manager->priv->session_managed = xfce_sm_client_connect (manager->priv->client, &error);
 299 -
 300 +
 301      if ( error )
 302      {
 303 -       g_warning ("Unable to connect to session managet : %s", error->message);
 304 +       g_warning ("Unable to connect to session manager : %s", error->message);
 305         g_error_free (error);
 306      }
 307      else
 308 @@ -502,10 +502,10 @@ xfpm_manager_new (DBusGConnection *bus, const gchar *client_id)
 309         g_signal_connect_swapped (manager->priv->client, "quit",
 310                                   G_CALLBACK (xfpm_manager_quit), manager);
 311      }
 312 -
 313 +
 314      xfpm_manager_dbus_class_init (XFPM_MANAGER_GET_CLASS (manager));
 315      xfpm_manager_dbus_init (manager);
 316 -
 317 +
 318      return manager;
 319  }
 320
 321 @@ -513,11 +513,11 @@ void xfpm_manager_start (XfpmManager *manager)
 322  {
 323      if ( !xfpm_manager_reserve_names (manager) )
 324         goto out;
 325 -
 326 +
 327      dbus_g_error_domain_register (XFPM_ERROR,
 328                                   NULL,
 329                                   XFPM_TYPE_ERROR);
 330 -
 331 +
 332      manager->priv->power = xfpm_power_get ();
 333      manager->priv->button = xfpm_button_new ();
 334      manager->priv->conf = xfpm_xfconf_new ();
 335 @@ -526,51 +526,51 @@ void xfpm_manager_start (XfpmManager *manager)
 336      manager->priv->disks = xfpm_disks_new ();
 337      manager->priv->inhibit = xfpm_inhibit_new ();
 338      manager->priv->idle = egg_idletime_new ();
 339 -
 340 +
 341      g_signal_connect (manager->priv->idle, "alarm-expired",
 342                       G_CALLBACK (xfpm_manager_alarm_timeout_cb), manager);
 343 -
 344 +
 345      g_signal_connect_swapped (manager->priv->conf, "notify::" ON_AC_INACTIVITY_TIMEOUT,
 346                               G_CALLBACK (xfpm_manager_set_idle_alarm_on_ac), manager);
 347 -
 348 +
 349      g_signal_connect_swapped (manager->priv->conf, "notify::" ON_BATTERY_INACTIVITY_TIMEOUT,
 350                               G_CALLBACK (xfpm_manager_set_idle_alarm_on_battery), manager);
 351 -
 352 +
 353      xfpm_manager_set_idle_alarm (manager);
 354 -
 355 +
 356      g_signal_connect (manager->priv->inhibit, "has-inhibit-changed",
 357                       G_CALLBACK (xfpm_manager_inhibit_changed_cb), manager);
 358 -
 359 +
 360      g_signal_connect (manager->priv->monitor, "system-bus-connection-changed",
 361                       G_CALLBACK (xfpm_manager_system_bus_connection_changed_cb), manager);
 362 -
 363 +
 364      manager->priv->backlight = xfpm_backlight_new ();
 365 -
 366 +
 367  #ifdef HAVE_DPMS
 368      manager->priv->dpms = xfpm_dpms_new ();
 369  #endif
 370 -
 371 +
 372      g_signal_connect (manager->priv->button, "button_pressed",
 373                       G_CALLBACK (xfpm_manager_button_pressed_cb), manager);
 374 -
 375 +
 376      g_signal_connect (manager->priv->power, "lid-changed",
 377                       G_CALLBACK (xfpm_manager_lid_changed_cb), manager);
 378 -
 379 +
 380      g_signal_connect (manager->priv->power, "on-battery-changed",
 381                       G_CALLBACK (xfpm_manager_on_battery_changed_cb), manager);
 382 -
 383 +
 384      g_signal_connect_swapped (manager->priv->power, "waking-up",
 385                               G_CALLBACK (xfpm_manager_reset_sleep_timer), manager);
 386 -
 387 +
 388      g_signal_connect_swapped (manager->priv->power, "sleeping",
 389                               G_CALLBACK (xfpm_manager_reset_sleep_timer), manager);
 390 -
 391 +
 392      g_signal_connect_swapped (manager->priv->power, "ask-shutdown",
 393                               G_CALLBACK (xfpm_manager_ask_shutdown), manager);
 394 -
 395 +
 396      g_signal_connect_swapped (manager->priv->power, "shutdown",
 397                               G_CALLBACK (xfpm_manager_shutdown), manager);
 398 -
 399 +
 400  out:
 401         ;
 402  }
 403 @@ -585,7 +585,7 @@ void xfpm_manager_stop (XfpmManager *manager)
 404  GHashTable *xfpm_manager_get_config (XfpmManager *manager)
 405  {
 406      GHashTable *hash;
 407 -
 408 +
 409      guint8 mapped_buttons;
 410      gboolean auth_hibernate = FALSE;
 411      gboolean auth_suspend = FALSE;
 412 @@ -600,9 +600,9 @@ GHashTable *xfpm_manager_get_config (XfpmManager *manager)
 413      gboolean has_lid = FALSE;
 414      gboolean can_spin = FALSE;
 415      gboolean devkit_disk = FALSE;
 416 -
 417 +
 418      hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
 419 -
 420 +
 421      g_object_get (G_OBJECT (manager->priv->console),
 422                   "can-shutdown", &can_shutdown,
 423                   NULL);
 424 @@ -611,25 +611,25 @@ GHashTable *xfpm_manager_get_config (XfpmManager *manager)
 425                    "auth-suspend", &auth_suspend,
 426                   "auth-hibernate", &auth_hibernate,
 427                    "can-suspend", &can_suspend,
 428 -                  "can-hibernate", &can_hibernate,
 429 +                  "can-hibernate", &can_hibernate,
 430                   "has-lid", &has_lid,
 431                   NULL);
 432
 433      can_spin = xfpm_disks_get_can_spin (manager->priv->disks);
 434      devkit_disk = xfpm_disks_kit_is_running (manager->priv->disks);
 435 -
 436 +
 437      has_battery = xfpm_power_has_battery (manager->priv->power);
 438      has_lcd_brightness = xfpm_backlight_has_hw (manager->priv->backlight);
 439 -
 440 +
 441      mapped_buttons = xfpm_button_get_mapped (manager->priv->button);
 442 -
 443 +
 444      if ( mapped_buttons & SLEEP_KEY )
 445          has_sleep_button = TRUE;
 446      if ( mapped_buttons & HIBERNATE_KEY )
 447          has_hibernate_button = TRUE;
 448      if ( mapped_buttons & POWER_KEY )
 449          has_power_button = TRUE;
 450 -
 451 +
 452      g_hash_table_insert (hash, g_strdup ("sleep-button"), g_strdup (xfpm_bool_to_string (has_sleep_button)));
 453      g_hash_table_insert (hash, g_strdup ("power-button"), g_strdup (xfpm_bool_to_string (has_power_button)));
 454      g_hash_table_insert (hash, g_strdup ("hibernate-button"), g_strdup (xfpm_bool_to_string (has_hibernate_button)));
 455 @@ -638,32 +638,32 @@ GHashTable *xfpm_manager_get_config (XfpmManager *manager)
 456      g_hash_table_insert (hash, g_strdup ("can-suspend"), g_strdup (xfpm_bool_to_string (can_suspend)));
 457      g_hash_table_insert (hash, g_strdup ("can-hibernate"), g_strdup (xfpm_bool_to_string (can_hibernate)));
 458      g_hash_table_insert (hash, g_strdup ("can-shutdown"), g_strdup (xfpm_bool_to_string (can_shutdown)));
 459 -
 460 +
 461      g_hash_table_insert (hash, g_strdup ("has-battery"), g_strdup (xfpm_bool_to_string (has_battery)));
 462      g_hash_table_insert (hash, g_strdup ("has-lid"), g_strdup (xfpm_bool_to_string (has_lid)));
 463      g_hash_table_insert (hash, g_strdup ("can-spin"), g_strdup (xfpm_bool_to_string (can_spin)));
 464      g_hash_table_insert (hash, g_strdup ("devkit-disk"), g_strdup (xfpm_bool_to_string (devkit_disk)));
 465 -
 466 +
 467      g_hash_table_insert (hash, g_strdup ("has-brightness"), g_strdup (xfpm_bool_to_string (has_lcd_brightness)));
 468 -
 469 +
 470      return hash;
 471  }
 472
 473  /*
 474 - *
 475 + *
 476   * DBus server implementation
 477 - *
 478 + *
 479   */
 480  static gboolean xfpm_manager_dbus_quit       (XfpmManager *manager,
 481                                               GError **error);
 482 -
 483 +
 484  static gboolean xfpm_manager_dbus_restart     (XfpmManager *manager,
 485                                                GError **error);
 486 -
 487 +
 488  static gboolean xfpm_manager_dbus_get_config (XfpmManager *manager,
 489                                               GHashTable **OUT_config,
 490                                               GError **error);
 491 -
 492 +
 493  static gboolean xfpm_manager_dbus_get_info   (XfpmManager *manager,
 494                                               gchar **OUT_name,
 495                                               gchar **OUT_version,
 496 @@ -691,9 +691,9 @@ static gboolean
 497  xfpm_manager_dbus_quit (XfpmManager *manager, GError **error)
 498  {
 499      XFPM_DEBUG("Quit message received\n");
 500 -
 501 +
 502      xfpm_manager_quit (manager);
 503 -
 504 +
 505      return TRUE;
 506  }
 507
 508 @@ -701,11 +701,11 @@ static gboolean xfpm_manager_dbus_restart     (XfpmManager *manager,
 509                                                GError **error)
 510  {
 511      XFPM_DEBUG("Restart message received");
 512 -
 513 +
 514      xfpm_manager_quit (manager);
 515 -
 516 +
 517      g_spawn_command_line_async ("xfce4-power-manager", NULL);
 518 -
 519 +
 520      return TRUE;
 521  }
 522
 523 @@ -713,22 +713,22 @@ static gboolean xfpm_manager_dbus_get_config (XfpmManager *manager,
 524                                               GHashTable **OUT_config,
 525                                               GError **error)
 526  {
 527 -
 528 +
 529      *OUT_config = xfpm_manager_get_config (manager);
 530      return TRUE;
 531  }
 532 -
 533 -static gboolean
 534 +
 535 +static gboolean
 536  xfpm_manager_dbus_get_info (XfpmManager *manager,
 537                             gchar **OUT_name,
 538                             gchar **OUT_version,
 539                             gchar **OUT_vendor,
 540                             GError **error)
 541  {
 542 -
 543 +
 544      *OUT_name    = g_strdup(PACKAGE);
 545      *OUT_version = g_strdup(VERSION);
 546      *OUT_vendor  = g_strdup("Xfce-goodies");
 547 -
 548 +
 549      return TRUE;
 550  }
 551 --
 552 1.9.3
 553