mate-power-manager_upower-use-g_signal-notify.patch

   1 diff -upr mate-power-manager-orig/src/gpm-backlight.c mate-power-manager-test/src/gpm-backlight.c
   2 --- mate-power-manager-orig/src/gpm-backlight.c 2013-10-14 22:33:51.545439000 +0200
   3 +++ mate-power-manager-test/src/gpm-backlight.c 2013-11-09 18:32:28.473654040 +0100
   4 @@ -371,7 +371,11 @@ gpm_backlight_brightness_evaluate_and_se
   5   * We might have to do things when the keys change; do them here.
   6   **/
   7  static void
   8 +#if UP_CHECK_VERSION(0, 99, 0)
   9 +gpm_settings_key_changed_cb (GSettings *settings, const gchar *key, GParamSpec *pspec, GpmBacklight *backlight)
  10 +#else
  11  gpm_settings_key_changed_cb (GSettings *settings, const gchar *key, GpmBacklight *backlight)
  12 +#endif
  13  {
  14         gboolean on_battery;
  15
  16 @@ -410,7 +414,11 @@ gpm_settings_key_changed_cb (GSettings *
  17   * Does the actions when the ac power source is inserted/removed.
  18   **/
  19  static void
  20 +#if UP_CHECK_VERSION(0, 99, 0)
  21 +gpm_backlight_client_changed_cb (UpClient *client, GParamSpec *pspec, GpmBacklight *backlight)
  22 +#else
  23  gpm_backlight_client_changed_cb (UpClient *client, GpmBacklight *backlight)
  24 +#endif
  25  {
  26         gpm_backlight_brightness_evaluate_and_set (backlight, FALSE, TRUE);
  27  }
  28 @@ -727,15 +735,24 @@ gpm_backlight_init (GpmBacklight *backli
  29
  30         /* we use up_client for the ac-adapter-changed signal */
  31         backlight->priv->client = up_client_new ();
  32 +#if UP_CHECK_VERSION(0, 99, 0)
  33 +       g_signal_connect (backlight->priv->client, "notify",
  34 +                         G_CALLBACK (gpm_backlight_client_changed_cb), backlight);
  35 +#else
  36         g_signal_connect (backlight->priv->client, "changed",
  37                           G_CALLBACK (gpm_backlight_client_changed_cb), backlight);
  38 +#endif
  39
  40         /* gets caps */
  41         backlight->priv->can_dim = gpm_brightness_has_hw (backlight->priv->brightness);
  42
  43         /* watch for dim value changes */
  44         backlight->priv->settings = g_settings_new (GPM_SETTINGS_SCHEMA);
  45 +#if UP_CHECK_VERSION(0, 99, 0)
  46 +       g_signal_connect (backlight->priv->settings, "notify", G_CALLBACK (gpm_settings_key_changed_cb), backlight);
  47 +#else
  48         g_signal_connect (backlight->priv->settings, "changed", G_CALLBACK (gpm_settings_key_changed_cb), backlight);
  49 +#endif
  50
  51         /* set the main brightness, this is designed to be updated if the user changes the
  52          * brightness so we can undim to the 'correct' value */
  53 diff -upr mate-power-manager-orig/src/gpm-button.c mate-power-manager-test/src/gpm-button.c
  54 --- mate-power-manager-orig/src/gpm-button.c    2013-10-14 22:33:51.546439000 +0200
  55 +++ mate-power-manager-test/src/gpm-button.c    2013-11-09 18:52:29.023698446 +0100
  56 @@ -324,7 +324,11 @@ gpm_button_reset_time (GpmButton *button
  57   * gpm_button_client_changed_cb
  58   **/
  59  static void
  60 +#if UP_CHECK_VERSION(0, 99, 0)
  61 +gpm_button_client_changed_cb (UpClient *client, GParamSpec *pspec, GpmButton *button)
  62 +#else
  63  gpm_button_client_changed_cb (UpClient *client, GpmButton *button)
  64 +#endif
  65  {
  66         gboolean lid_is_closed;
  67
  68 @@ -363,9 +367,13 @@ gpm_button_init (GpmButton *button)
  69
  70         button->priv->client = up_client_new ();
  71         button->priv->lid_is_closed = up_client_get_lid_is_closed (button->priv->client);
  72 +#if UP_CHECK_VERSION(0, 99, 0)
  73 +       g_signal_connect (button->priv->client, "notify",
  74 +                         G_CALLBACK (gpm_button_client_changed_cb), button);
  75 +#else
  76         g_signal_connect (button->priv->client, "changed",
  77                           G_CALLBACK (gpm_button_client_changed_cb), button);
  78 -
  79 +#endif
  80         /* register the brightness keys */
  81         gpm_button_xevent_key (button, XF86XK_PowerOff, GPM_BUTTON_POWER);
  82  #ifdef HAVE_XF86XK_SUSPEND
  83 diff -upr mate-power-manager-orig/src/gpm-engine.c mate-power-manager-test/src/gpm-engine.c
  84 --- mate-power-manager-orig/src/gpm-engine.c    2013-11-09 19:24:00.804668000 +0100
  85 +++ mate-power-manager-test/src/gpm-engine.c    2013-11-09 19:33:10.997189469 +0100
  86 @@ -511,7 +511,11 @@ gpm_engine_recalculate_state (GpmEngine
  87   * gpm_engine_settings_key_changed_cb:
  88   **/
  89  static void
  90 +#if UP_CHECK_VERSION(0, 99, 0)
  91 +gpm_engine_settings_key_changed_cb (GSettings *settings, const gchar *key, GParamSpec *pspec, GpmEngine *engine)
  92 +#else
  93  gpm_engine_settings_key_changed_cb (GSettings *settings, const gchar *key, GpmEngine *engine)
  94 +#endif
  95  {
  96
  97         if (g_strcmp0 (key, GPM_SETTINGS_USE_TIME_POLICY) == 0) {
  98 @@ -878,7 +882,11 @@ gpm_engine_device_removed_cb (UpClient *
  99   * gpm_engine_device_changed_cb:
 100   **/
 101  static void
 102 +#if UP_CHECK_VERSION(0, 99, 0)
 103 +gpm_engine_device_changed_cb (UpClient *client, UpDevice *device, GParamSpec *pspec, GpmEngine *engine)
 104 +#else
 105  gpm_engine_device_changed_cb (UpClient *client, UpDevice *device, GpmEngine *engine)
 106 +#endif
 107  {
 108         UpDeviceKind kind;
 109         UpDeviceState state;
 110 @@ -1060,12 +1068,23 @@ gpm_engine_init (GpmEngine *engine)
 111                           G_CALLBACK (gpm_engine_device_added_cb), engine);
 112         g_signal_connect (engine->priv->client, "device-removed",
 113                           G_CALLBACK (gpm_engine_device_removed_cb), engine);
 114 +#if UP_CHECK_VERSION(0, 99, 0)
 115 +       g_signal_connect (engine->priv->client, "notify",
 116 +                         G_CALLBACK (gpm_engine_device_changed_cb), engine);
 117 +#else
 118         g_signal_connect (engine->priv->client, "device-changed",
 119                           G_CALLBACK (gpm_engine_device_changed_cb), engine);
 120 +#endif
 121
 122         engine->priv->settings = g_settings_new (GPM_SETTINGS_SCHEMA);
 123 +#if UP_CHECK_VERSION(0, 99, 0)
 124 +       g_signal_connect (engine->priv->settings, "notify",
 125 +                         G_CALLBACK (gpm_engine_settings_key_changed_cb), engine);
 126 +#else
 127         g_signal_connect (engine->priv->settings, "changed",
 128                           G_CALLBACK (gpm_engine_settings_key_changed_cb), engine);
 129 +#endif
 130 +
 131
 132         engine->priv->phone = gpm_phone_new ();
 133         g_signal_connect (engine->priv->phone, "device-added",
 134 diff -upr mate-power-manager-orig/src/gpm-kbd-backlight.c mate-power-manager-test/src/gpm-kbd-backlight.c
 135 --- mate-power-manager-orig/src/gpm-kbd-backlight.c     2013-10-14 22:33:51.548439000 +0200
 136 +++ mate-power-manager-test/src/gpm-kbd-backlight.c     2013-11-09 21:05:54.589660859 +0100
 137 @@ -531,8 +531,13 @@ gpm_kbd_backlight_control_resume_cb (Gpm
 138   * Does the actions when the ac power source is inserted/removed.
 139   **/
 140  static void
 141 +#if UP_CHECK_VERSION(0, 99, 0)
 142 +gpm_kbd_backlight_client_changed_cb (UpClient *client, GParamSpec *pspec,
 143 +                    GpmKbdBacklight *backlight)
 144 +#else
 145  gpm_kbd_backlight_client_changed_cb (UpClient *client,
 146                      GpmKbdBacklight *backlight)
 147 +#endif
 148  {
 149     gpm_kbd_backlight_evaluate_power_source_and_set (backlight);
 150  }
 151 @@ -801,8 +806,13 @@ noerr:
 152
 153     /* Use upower for ac changed signal */
 154     backlight->priv->client = up_client_new ();
 155 +#if UP_CHECK_VERSION(0, 99, 0)
 156 +   g_signal_connect (backlight->priv->client, "notify",
 157 +             G_CALLBACK (gpm_kbd_backlight_client_changed_cb), backlight);
 158 +#else
 159     g_signal_connect (backlight->priv->client, "changed",
 160               G_CALLBACK (gpm_kbd_backlight_client_changed_cb), backlight);
 161 +#endif
 162
 163      backlight->priv->settings = g_settings_new (GPM_SETTINGS_SCHEMA);
 164         //g_signal_connect (backlight->priv->settings, "changed", G_CALLBACK (gpm_settings_key_changed_cb), backlight);
 165 diff -upr mate-power-manager-orig/src/gpm-manager.c mate-power-manager-test/src/gpm-manager.c
 166 --- mate-power-manager-orig/src/gpm-manager.c   2013-11-09 01:33:29.050924000 +0100
 167 +++ mate-power-manager-test/src/gpm-manager.c   2013-11-09 18:33:36.013331734 +0100
 168 @@ -971,7 +971,11 @@ gpm_manager_get_spindown_timeout (GpmMan
 169   * gpm_manager_client_changed_cb:
 170   **/
 171  static void
 172 +#if UP_CHECK_VERSION(0, 99, 0)
 173  gpm_manager_client_changed_cb (UpClient *client, GpmManager *manager)
 174 +#else
 175 +gpm_manager_client_changed_cb (UpClient *client, GParamSpec *pspec, GpmManager *manager)
 176 +#endif
 177  {
 178         gboolean event_when_closed;
 179         gint timeout;
 180 @@ -1081,7 +1085,11 @@ gpm_manager_class_init (GpmManagerClass
 181   * We might have to do things when the keys change; do them here.
 182   **/
 183  static void
 184 +#if UP_CHECK_VERSION(0, 99, 0)
 185 +gpm_manager_settings_changed_cb (GSettings *settings, const gchar *key, GParamSpec *pspec, GpmManager *manager)
 186 +#else
 187  gpm_manager_settings_changed_cb (GSettings *settings, const gchar *key, GpmManager *manager)
 188 +#endif
 189  {
 190         if (g_strcmp0 (key, GPM_SETTINGS_SLEEP_COMPUTER_BATT) == 0 ||
 191             g_strcmp0 (key, GPM_SETTINGS_SLEEP_COMPUTER_AC) == 0 ||
 192 @@ -1957,11 +1965,19 @@ gpm_manager_init (GpmManager *manager)
 193         manager->priv->notification_fully_charged = NULL;
 194         manager->priv->disks = gpm_disks_new ();
 195         manager->priv->settings = g_settings_new (GPM_SETTINGS_SCHEMA);
 196 +#if UP_CHECK_VERSION(0, 99, 0)
 197 +       g_signal_connect (manager->priv->settings, "notify",
 198 +                         G_CALLBACK (gpm_manager_settings_changed_cb), manager);
 199 +       manager->priv->client = up_client_new ();
 200 +       g_signal_connect (manager->priv->client, "notify",
 201 +                         G_CALLBACK (gpm_manager_client_changed_cb), manager);
 202 +#else
 203         g_signal_connect (manager->priv->settings, "changed",
 204                           G_CALLBACK (gpm_manager_settings_changed_cb), manager);
 205         manager->priv->client = up_client_new ();
 206         g_signal_connect (manager->priv->client, "changed",
 207                           G_CALLBACK (gpm_manager_client_changed_cb), manager);
 208 +#endif
 209
 210         /* use libmatenotify */
 211         notify_init (GPM_NAME);
 212 diff -upr mate-power-manager-orig/src/gpm-prefs-core.c mate-power-manager-test/src/gpm-prefs-core.c
 213 --- mate-power-manager-orig/src/gpm-prefs-core.c        2013-11-08 21:19:48.232969000 +0100
 214 +++ mate-power-manager-test/src/gpm-prefs-core.c        2013-11-09 18:34:33.846912025 +0100
 215 @@ -156,7 +156,11 @@ gpm_prefs_format_percentage_cb (GtkScale
 216   * gpm_prefs_action_combo_changed_cb:
 217   **/
 218  static void
 219 +#if UP_CHECK_VERSION(0, 99, 0)
 220 +gpm_prefs_action_combo_changed_cb (GtkWidget *widget, GParamSpec *pspec, GpmPrefs *prefs)
 221 +#else
 222  gpm_prefs_action_combo_changed_cb (GtkWidget *widget, GpmPrefs *prefs)
 223 +#endif
 224  {
 225         GpmActionPolicy policy;
 226         const GpmActionPolicy *actions;
 227 @@ -175,7 +179,11 @@ gpm_prefs_action_combo_changed_cb (GtkWi
 228   * gpm_prefs_action_time_changed_cb:
 229   **/
 230  static void
 231 +#if UP_CHECK_VERSION(0, 99, 0)
 232 +gpm_prefs_action_time_changed_cb (GtkWidget *widget, GParamSpec *pspec, GpmPrefs *prefs)
 233 +#else
 234  gpm_prefs_action_time_changed_cb (GtkWidget *widget, GpmPrefs *prefs)
 235 +#endif
 236  {
 237         guint value;
 238         const gint *values;
 239 @@ -254,8 +262,13 @@ gpm_prefs_setup_action_combo (GpmPrefs *
 240
 241         array = g_ptr_array_new ();
 242         g_object_set_data (G_OBJECT (widget), "settings_key", (gpointer) gpm_pref_key);
 243 +#if UP_CHECK_VERSION(0, 99, 0)
 244 +       g_signal_connect (G_OBJECT (widget), "notify",
 245 +                         G_CALLBACK (gpm_prefs_action_combo_changed_cb), prefs);
 246 +#else
 247         g_signal_connect (G_OBJECT (widget), "changed",
 248                           G_CALLBACK (gpm_prefs_action_combo_changed_cb), prefs);
 249 +#endif
 250
 251         for (i=0; actions[i] != -1; i++) {
 252                 policy = actions[i];
 253 @@ -389,8 +402,13 @@ gpm_prefs_setup_time_combo (GpmPrefs *pr
 254         }
 255
 256         /* connect after set */
 257 +#if UP_CHECK_VERSION(0, 99, 0)
 258 +       g_signal_connect (G_OBJECT (widget), "notify",
 259 +                         G_CALLBACK (gpm_prefs_action_time_changed_cb), prefs);
 260 +#else
 261         g_signal_connect (G_OBJECT (widget), "changed",
 262                           G_CALLBACK (gpm_prefs_action_time_changed_cb), prefs);
 263 +#endif
 264  }
 265
 266  /**
 267 diff -upr mate-power-manager-orig/src/gpm-statistics.c mate-power-manager-test/src/gpm-statistics.c
 268 --- mate-power-manager-orig/src/gpm-statistics.c        2013-11-08 21:19:48.233969000 +0100
 269 +++ mate-power-manager-test/src/gpm-statistics.c        2013-11-09 19:40:14.983443786 +0100
 270 @@ -1139,7 +1139,11 @@ gpm_stats_button_update_ui (void)
 271   * gpm_stats_devices_treeview_clicked_cb:
 272   **/
 273  static void
 274 +#if UP_CHECK_VERSION(0, 99, 0)
 275 +gpm_stats_devices_treeview_clicked_cb (GtkTreeSelection *selection, GParamSpec *pspec, gboolean data)
 276 +#else
 277  gpm_stats_devices_treeview_clicked_cb (GtkTreeSelection *selection, gboolean data)
 278 +#endif
 279  {
 280         GtkTreeModel *model;
 281         GtkTreeIter iter;
 282 @@ -1236,7 +1240,11 @@ gpm_stats_device_added_cb (UpClient *cli
 283   * gpm_stats_device_changed_cb:
 284   **/
 285  static void
 286 +#if UP_CHECK_VERSION(0, 99, 0)
 287 +gpm_stats_device_changed_cb (UpClient *client, UpDevice *device, GParamSpec *pspec, gpointer user_data)
 288 +#else
 289  gpm_stats_device_changed_cb (UpClient *client, UpDevice *device, gpointer user_data)
 290 +#endif
 291  {
 292         const gchar *object_path;
 293         object_path = up_device_get_object_path (device);
 294 @@ -1281,7 +1289,11 @@ gpm_stats_device_removed_cb (UpClient *c
 295   * gpm_stats_history_type_combo_changed_cb:
 296   **/
 297  static void
 298 +#if UP_CHECK_VERSION(0, 99, 0)
 299 +gpm_stats_history_type_combo_changed_cb (GtkWidget *widget, GParamSpec *pspec, gpointer data)
 300 +#else
 301  gpm_stats_history_type_combo_changed_cb (GtkWidget *widget, gpointer data)
 302 +#endif
 303  {
 304         guint active;
 305         const gchar *axis_x = NULL;
 306 @@ -1333,7 +1345,11 @@ gpm_stats_history_type_combo_changed_cb
 307   * gpm_stats_type_combo_changed_cb:
 308   **/
 309  static void
 310 +#if UP_CHECK_VERSION(0, 99, 0)
 311 +gpm_stats_type_combo_changed_cb (GtkWidget *widget, GParamSpec *pspec, gpointer data)
 312 +#else
 313  gpm_stats_type_combo_changed_cb (GtkWidget *widget, gpointer data)
 314 +#endif
 315  {
 316         guint active;
 317         const gchar *axis_x = NULL;
 318 @@ -1385,7 +1401,11 @@ gpm_stats_type_combo_changed_cb (GtkWidg
 319   * gpm_stats_range_combo_changed:
 320   **/
 321  static void
 322 +#if UP_CHECK_VERSION(0, 99, 0)
 323 +gpm_stats_range_combo_changed (GtkWidget *widget, GParamSpec *pspec, gpointer data)
 324 +#else
 325  gpm_stats_range_combo_changed (GtkWidget *widget, gpointer data)
 326 +#endif
 327  {
 328         guint active;
 329
 330 @@ -1692,8 +1712,13 @@ main (int argc, char *argv[])
 331         gtk_tree_view_set_model (GTK_TREE_VIEW (widget),
 332                                  GTK_TREE_MODEL (list_store_devices));
 333         selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (widget));
 334 +#if UP_CHECK_VERSION(0, 99, 0)
 335 +       g_signal_connect (selection, "notify",
 336 +                         G_CALLBACK (gpm_stats_devices_treeview_clicked_cb), NULL);
 337 +#else
 338         g_signal_connect (selection, "changed",
 339                           G_CALLBACK (gpm_stats_devices_treeview_clicked_cb), NULL);
 340 +#endif
 341
 342         /* add columns to the tree view */
 343         gpm_stats_add_devices_columns (GTK_TREE_VIEW (widget));
 344 @@ -1736,8 +1761,13 @@ main (int argc, char *argv[])
 345                 gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0);
 346         else
 347                 gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 1);
 348 +#if UP_CHECK_VERSION(0, 99, 0)
 349 +       g_signal_connect (G_OBJECT (widget), "notify",
 350 +                         G_CALLBACK (gpm_stats_history_type_combo_changed_cb), NULL);
 351 +#else
 352         g_signal_connect (G_OBJECT (widget), "changed",
 353                           G_CALLBACK (gpm_stats_history_type_combo_changed_cb), NULL);
 354 +#endif
 355
 356         widget = GTK_WIDGET (gtk_builder_get_object (builder, "combobox_stats_type"));
 357         gpm_stats_set_combo_simple_text (widget);
 358 @@ -1762,8 +1792,13 @@ main (int argc, char *argv[])
 359                 gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0);
 360         else
 361                 gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 3);
 362 +#if UP_CHECK_VERSION(0, 99, 0)
 363 +       g_signal_connect (G_OBJECT (widget), "notify",
 364 +                         G_CALLBACK (gpm_stats_type_combo_changed_cb), NULL);
 365 +#else
 366         g_signal_connect (G_OBJECT (widget), "changed",
 367                           G_CALLBACK (gpm_stats_type_combo_changed_cb), NULL);
 368 +#endif
 369
 370         widget = GTK_WIDGET (gtk_builder_get_object (builder, "combobox_history_time"));
 371         gpm_stats_set_combo_simple_text (widget);
 372 @@ -1787,8 +1822,13 @@ main (int argc, char *argv[])
 373                 gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 1);
 374         else
 375                 gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 2);
 376 +#if UP_CHECK_VERSION(0, 99, 0)
 377 +       g_signal_connect (G_OBJECT (widget), "notify",
 378 +                         G_CALLBACK (gpm_stats_range_combo_changed), NULL);
 379 +#else
 380         g_signal_connect (G_OBJECT (widget), "changed",
 381                           G_CALLBACK (gpm_stats_range_combo_changed), NULL);
 382 +#endif
 383
 384         client = up_client_new ();
 385
 386 @@ -1815,7 +1855,11 @@ main (int argc, char *argv[])
 387         /* connect now the coldplug is done */
 388         g_signal_connect (client, "device-added", G_CALLBACK (gpm_stats_device_added_cb), NULL);
 389         g_signal_connect (client, "device-removed", G_CALLBACK (gpm_stats_device_removed_cb), NULL);
 390 +#if UP_CHECK_VERSION(0, 99, 0)
 391 +       g_signal_connect (client, "notify", G_CALLBACK (gpm_stats_device_changed_cb), NULL);
 392 +#else
 393         g_signal_connect (client, "device-changed", G_CALLBACK (gpm_stats_device_changed_cb), NULL);
 394 +#endif
 395
 396         /* set current device */
 397         if (devices->len > 0) {
 398 @@ -1847,9 +1891,9 @@ main (int argc, char *argv[])
 399
 400         /* set axis */
 401         widget = GTK_WIDGET (gtk_builder_get_object (builder, "combobox_history_type"));
 402 -       gpm_stats_history_type_combo_changed_cb (widget, NULL);
 403 +       gpm_stats_history_type_combo_changed_cb (widget, NULL, NULL);
 404         widget = GTK_WIDGET (gtk_builder_get_object (builder, "combobox_stats_type"));
 405 -       gpm_stats_type_combo_changed_cb (widget, NULL);
 406 +       gpm_stats_type_combo_changed_cb (widget, NULL, NULL);
 407
 408         widget = GTK_WIDGET (gtk_builder_get_object (builder, "dialog_stats"));
 409         gtk_widget_show (widget);
 410 diff -upr mate-power-manager-orig/src/gpm-tray-icon.c mate-power-manager-test/src/gpm-tray-icon.c
 411 --- mate-power-manager-orig/src/gpm-tray-icon.c 2013-10-14 22:33:51.552439000 +0200
 412 +++ mate-power-manager-test/src/gpm-tray-icon.c 2013-11-09 18:34:52.573099918 +0100
 413 @@ -343,7 +343,11 @@ gpm_tray_icon_activate_cb (GtkStatusIcon
 414   * We might have to do things when the settings change; do them here.
 415   **/
 416  static void
 417 +#if UP_CHECK_VERSION(0, 99, 0)
 418 +gpm_tray_icon_settings_changed_cb (GSettings *settings, const gchar *key, GParamSpec *pspec, GpmTrayIcon *icon)
 419 +#else
 420  gpm_tray_icon_settings_changed_cb (GSettings *settings, const gchar *key, GpmTrayIcon *icon)
 421 +#endif
 422  {
 423         gboolean allowed_in_menu;
 424
 425 @@ -368,8 +372,13 @@ gpm_tray_icon_init (GpmTrayIcon *icon)
 426         icon->priv->engine = gpm_engine_new ();
 427
 428         icon->priv->settings = g_settings_new (GPM_SETTINGS_SCHEMA);
 429 +#if UP_CHECK_VERSION(0, 99, 0)
 430 +       g_signal_connect (icon->priv->settings, "notify",
 431 +                         G_CALLBACK (gpm_tray_icon_settings_changed_cb), icon);
 432 +#else
 433         g_signal_connect (icon->priv->settings, "changed",
 434                           G_CALLBACK (gpm_tray_icon_settings_changed_cb), icon);
 435 +#endif
 436
 437         icon->priv->status_icon = gtk_status_icon_new ();
 438         g_signal_connect_object (G_OBJECT (icon->priv->status_icon),