mate-power-manager_upower-remove-recall.patch

   1 diff -upr mate-power-manager-orig/data/org.mate.power-manager.gschema.xml.in mate-power-manager-test/data/org.mate.power-manager.gschema.xml.in
   2 --- mate-power-manager-orig/data/org.mate.power-manager.gschema.xml.in  2013-10-21 11:01:49.245340000 +0200
   3 +++ mate-power-manager-test/data/org.mate.power-manager.gschema.xml.in  2013-11-09 01:00:37.801114147 +0100
   4 @@ -211,11 +211,6 @@
   5        <_summary>Seconds of inactivity to spin down when on battery</_summary>
   6        <_description>The number of seconds of inactivity to spin down the disks when on battery power.</_description>
   7      </key>
   8 -    <key name="notify-perhaps-recall" type="b">
   9 -      <default>true</default>
  10 -      <_summary>If we should show the recalled battery warning for a broken battery</_summary>
  11 -      <_description>If we should show the recalled battery warning for a broken battery. Set this to false only if you know your battery is okay.</_description>
  12 -    </key>
  13      <key name="notify-low-capacity" type="b">
  14        <default>true</default>
  15        <_summary>If we should show the low capacity warning for a broken battery</_summary>
  16 diff -upr mate-power-manager-orig/src/gpm-engine.c mate-power-manager-test/src/gpm-engine.c
  17 --- mate-power-manager-orig/src/gpm-engine.c    2013-11-08 22:45:52.333993000 +0100
  18 +++ mate-power-manager-test/src/gpm-engine.c    2013-11-08 23:06:27.444397476 +0100
  19 @@ -760,6 +760,7 @@ gpm_engine_device_add (GpmEngine *engine
  20         }
  21  }
  22
  23 +#if !UP_CHECK_VERSION(0, 99, 0)
  24  /**
  25   * gpm_engine_check_recall:
  26   **/
  27 @@ -795,7 +796,7 @@ out:
  28         g_free (recall_url);
  29         return recall_notice;
  30  }
  31 -
  32 +#endif
  33  /**
  34   * gpm_engine_coldplug_idle_cb:
  35   **/
  36 @@ -831,7 +832,9 @@ gpm_engine_coldplug_idle_cb (GpmEngine *
  37         for (i=0;i<array->len;i++) {
  38                 device = g_ptr_array_index (array, i);
  39                 gpm_engine_device_add (engine, device);
  40 +#if !UP_CHECK_VERSION(0, 99, 0)
  41                 gpm_engine_check_recall (engine, device);
  42 +#endif
  43         }
  44  #if !UP_CHECK_VERSION(0, 99, 0)
  45  out:
  46 @@ -850,7 +853,9 @@ gpm_engine_device_added_cb (UpClient *cl
  47  {
  48         /* add to list */
  49         g_ptr_array_add (engine->priv->array, g_object_ref (device));
  50 +#if !UP_CHECK_VERSION(0, 99, 0)
  51         gpm_engine_check_recall (engine, device);
  52 +#endif
  53
  54         gpm_engine_recalculate_state (engine);
  55  }
  56 @@ -1154,6 +1159,7 @@ gpm_engine_class_init (GpmEngineClass *k
  57                               G_STRUCT_OFFSET (GpmEngineClass, low_capacity),
  58                               NULL, NULL, g_cclosure_marshal_VOID__POINTER,
  59                               G_TYPE_NONE, 1, G_TYPE_POINTER);
  60 +#if !UP_CHECK_VERSION(0, 99, 0)
  61         signals [PERHAPS_RECALL] =
  62                 g_signal_new ("perhaps-recall",
  63                               G_TYPE_FROM_CLASS (object_class),
  64 @@ -1162,6 +1168,7 @@ gpm_engine_class_init (GpmEngineClass *k
  65                               NULL, NULL, gpm_marshal_VOID__POINTER_STRING_STRING,
  66                               G_TYPE_NONE,
  67                               3, G_TYPE_POINTER, G_TYPE_STRING, G_TYPE_STRING);
  68 +#endif
  69         signals [FULLY_CHARGED] =
  70                 g_signal_new ("fully-charged",
  71                               G_TYPE_FROM_CLASS (object_class),
  72 diff -upr mate-power-manager-orig/src/gpm-engine.h mate-power-manager-test/src/gpm-engine.h
  73 --- mate-power-manager-orig/src/gpm-engine.h    2013-10-14 22:33:51.547439000 +0200
  74 +++ mate-power-manager-test/src/gpm-engine.h    2013-11-08 22:59:05.547961683 +0100
  75 @@ -49,10 +49,12 @@ typedef struct
  76                                                  gchar          *icon);
  77         void            (* summary_changed)     (GpmEngine      *engine,
  78                                                  gchar          *status);
  79 +#if !UP_CHECK_VERSION(0, 99, 0)
  80         void            (* perhaps_recall)      (GpmEngine      *engine,
  81                                                  UpDevice       *device,
  82                                                  const gchar    *oem_vendor,
  83                                                  const gchar    *website);
  84 +#endif
  85         void            (* low_capacity)        (GpmEngine      *engine,
  86                                                  UpDevice       *device);
  87         void            (* charge_low)          (GpmEngine      *engine,
  88 diff -upr mate-power-manager-orig/src/gpm-manager.c mate-power-manager-test/src/gpm-manager.c
  89 --- mate-power-manager-orig/src/gpm-manager.c   2013-10-14 22:33:51.549439000 +0200
  90 +++ mate-power-manager-test/src/gpm-manager.c   2013-11-08 23:02:10.741820700 +0100
  91 @@ -1090,6 +1090,7 @@ gpm_manager_settings_changed_cb (GSettin
  92                 gpm_manager_sync_policy_sleep (manager);
  93  }
  94
  95 +#if !UP_CHECK_VERSION(0, 99, 0)
  96  /**
  97   * gpm_manager_perhaps_recall_response_cb:
  98   */
  99 @@ -1194,6 +1195,7 @@ gpm_manager_engine_perhaps_recall_cb (Gp
 100         /* delay by a few seconds so the panel can load */
 101         g_timeout_add_seconds (GPM_MANAGER_RECALL_DELAY, (GSourceFunc) gpm_manager_perhaps_recall_delay_cb, manager);
 102  }
 103 +#endif
 104
 105  /**
 106   * gpm_manager_engine_icon_changed_cb:
 107 @@ -2020,8 +2022,10 @@ gpm_manager_init (GpmManager *manager)
 108         gpm_manager_sync_policy_sleep (manager);
 109
 110         manager->priv->engine = gpm_engine_new ();
 111 +#if !UP_CHECK_VERSION(0, 99, 0)
 112         g_signal_connect (manager->priv->engine, "perhaps-recall",
 113                           G_CALLBACK (gpm_manager_engine_perhaps_recall_cb), manager);
 114 +#endif
 115         g_signal_connect (manager->priv->engine, "low-capacity",
 116                           G_CALLBACK (gpm_manager_engine_low_capacity_cb), manager);
 117         g_signal_connect (manager->priv->engine, "icon-changed",