Silence some gir-2.0-related warnings.

Author: mtwebster

calendar-server/cinnamon-calendar-server.py

@@ -229,7 +229,7 @@ def update_status(self):
             if self.is_relevant_source(None, source):
                 status = STATUS_HAS_CALENDARS
 
-        self.interface.set_property("status", status)
+        self.interface.set_status(status)
 
         if status == STATUS_NO_CALENDARS:
             self.exit()

files/usr/share/cinnamon/applets/calendar@cinnamon.org/eventView.js

@@ -475,18 +475,19 @@ class EventsManager {
     }
 
     _handle_status_notify(server, pspec) {
-        if (this._calendar_server.status === this._cached_state) {
+        const status = this._calendar_server.get_status();
+        if (status === this._cached_state) {
             return;
         }
 
         // Never reload when the new status is STATUS_UNKNOWN - this
         // means the server name-owner disappeared, it doesn't mean
         // there are no calendars.
-        if (this._calendar_server.status === STATUS_UNKNOWN) {
+        if (status === STATUS_UNKNOWN) {
             return;
         }
 
-        this._cached_state = this._calendar_server.status;
+        this._cached_state = status;
         this.queue_reload_today(true);
         this.emit("has-calendars-changed");
     }

src/cinnamon-global.c

@@ -355,7 +355,7 @@ cinnamon_global_class_init (CinnamonGlobalClass *klass)
                                    g_param_spec_object ("stage",
                                                         "Stage",
                                                         "Stage holding the desktop scene graph",
-                                                        CLUTTER_TYPE_ACTOR,
+                                                        CLUTTER_TYPE_STAGE,
                                                         G_PARAM_READABLE));
   g_object_class_install_property (gobject_class,
                                    PROP_STAGE_INPUT_MODE,

src/st/st-entry.c

@@ -1179,12 +1179,12 @@ st_entry_set_text (StEntry     *entry,
  * Returns: (transfer none): the #ClutterText used by #StEntry. The entry is
  * owned by the #StEntry and should not be unref'ed by the application.
  */
-ClutterActor*
+ClutterText *
 st_entry_get_clutter_text (StEntry *entry)
 {
   g_return_val_if_fail (ST_ENTRY (entry), NULL);
 
-  return entry->priv->entry;
+  return (ClutterText *) entry->priv->entry;
 }
 
 /**

src/st/st-entry.h

@@ -68,7 +68,7 @@ StWidget *            st_entry_new              (const gchar *text);
 const gchar *         st_entry_get_text         (StEntry     *entry);
 void                  st_entry_set_text         (StEntry     *entry,
                                                  const gchar *text);
-ClutterActor*         st_entry_get_clutter_text (StEntry     *entry);
+ClutterText *         st_entry_get_clutter_text (StEntry     *entry);
 
 void                  st_entry_set_hint_text    (StEntry     *entry,
                                                  const gchar *text);

src/st/st-label.c

@@ -388,12 +388,12 @@ st_label_set_text (StLabel     *label,
  * Returns: (transfer none): ethe #ClutterText used by #StLabel. The label
  * is owned by the #StLabel and should not be unref'ed by the application.
  */
-ClutterActor*
+ClutterText *
 st_label_get_clutter_text (StLabel *label)
 {
   g_return_val_if_fail (ST_IS_LABEL (label), NULL);
 
-  return label->priv->label;
+  return (ClutterText *) label->priv->label;
 }
 
 

src/st/st-label.h

@@ -64,7 +64,7 @@ StWidget *     st_label_new              (const gchar *text);
 const gchar *  st_label_get_text         (StLabel     *label);
 void           st_label_set_text         (StLabel     *label,
                                           const gchar *text);
-ClutterActor * st_label_get_clutter_text (StLabel     *label);
+ClutterText * st_label_get_clutter_text (StLabel     *label);
 
 G_END_DECLS
 

src/st/st-password-entry.c

@@ -141,10 +141,10 @@ clutter_text_password_char_cb (GObject    *object,
                                gpointer    user_data)
 {
   StPasswordEntry *entry = ST_PASSWORD_ENTRY (user_data);
-  ClutterActor *clutter_text;
+  ClutterText *clutter_text;
 
   clutter_text = st_entry_get_clutter_text (ST_ENTRY (entry));
-  if (clutter_text_get_password_char (CLUTTER_TEXT (clutter_text)) == 0)
+  if (clutter_text_get_password_char (clutter_text) == 0)
     st_password_entry_set_password_visible (entry, TRUE);
   else
     st_password_entry_set_password_visible (entry, FALSE);
@@ -154,7 +154,7 @@ static void
 st_password_entry_init (StPasswordEntry *entry)
 {
   StPasswordEntryPrivate *priv;
-  ClutterActor *clutter_text;
+  ClutterText *clutter_text;
 
   priv = entry->priv = st_password_entry_get_instance_private (entry);
 
@@ -167,7 +167,7 @@ st_password_entry_init (StPasswordEntry *entry)
   priv->show_peek_icon = TRUE;
 
   clutter_text = st_entry_get_clutter_text (ST_ENTRY (entry));
-  clutter_text_set_password_char (CLUTTER_TEXT (clutter_text), BULLET);
+  clutter_text_set_password_char (clutter_text, BULLET);
 
   g_signal_connect (clutter_text, "notify::password-char",
                     G_CALLBACK (clutter_text_password_char_cb), entry);
@@ -243,7 +243,7 @@ st_password_entry_set_password_visible (StPasswordEntry *entry,
                                         gboolean         value)
 {
   StPasswordEntryPrivate *priv;
-  ClutterActor *clutter_text;
+  ClutterText *clutter_text;
 
   g_return_if_fail (ST_IS_PASSWORD_ENTRY (entry));
 
@@ -256,12 +256,12 @@ st_password_entry_set_password_visible (StPasswordEntry *entry,
   clutter_text = st_entry_get_clutter_text (ST_ENTRY (entry));
   if (priv->password_visible)
     {
-      clutter_text_set_password_char (CLUTTER_TEXT (clutter_text), 0);
+      clutter_text_set_password_char (clutter_text, 0);
       st_icon_set_icon_name (ST_ICON (priv->peek_password_icon), "xsi-view-reveal-symbolic");
     }
   else
     {
-      clutter_text_set_password_char (CLUTTER_TEXT (clutter_text), BULLET);
+      clutter_text_set_password_char (clutter_text, BULLET);
       st_icon_set_icon_name (ST_ICON (priv->peek_password_icon), "xsi-view-conceal-symbolic");
     }