← Back to branch summary

~mandel/ubuntuone-client/donot-add-watches-parents

« back to all changes in this revision

Viewing changes to nautilus/ubuntuone-nautilus.c

  • Committer: Rodrigo Moya
  • Date: 2010-06-24 10:25:12 UTC
  • mto: This revision was merged to the branch mainline in revision 564.
  • Revision ID: rodrigo.moya@canonical.com-20100624102512-2d6b12bmaa25tl0v
Use SyncdaemonStatusInterface from the Nautilus plugin

Show diffs side-by-side

added added

removed removed

Lines of Context:
nautilus/ubuntuone-nautilus.c
78
78
static void ubuntuone_nautilus_got_shared (DBusGProxy * proxy,
79
79
                                           DBusGProxyCall * call_id,
80
80
                                           gpointer user_data);
81
 
static void ubuntuone_nautilus_status_changed (DBusGProxy * proxy,
82
 
                                               GHashTable * hash,
 
81
static void ubuntuone_nautilus_status_changed (SyncdaemonDaemon *daemon,
 
82
                                               SyncdaemonStatusInfo *status_info,
83
83
                                               gpointer user_data);
84
 
static void ubuntuone_nautilus_upload_started (DBusGProxy * proxy,
 
84
static void ubuntuone_nautilus_upload_started (SyncdaemonDaemon *daemon,
85
85
                                               gchar * path,
86
86
                                               gpointer user_data);
87
 
static void ubuntuone_nautilus_upload_finished (DBusGProxy * proxy,
88
 
                                                 gchar * path, GHashTable * info,
89
 
                                                 gpointer user_data);
90
 
static void ubuntuone_nautilus_download_started (DBusGProxy * proxy,
91
 
                                                 gchar * path,
92
 
                                                 gpointer user_data);
93
 
static void ubuntuone_nautilus_download_finished (DBusGProxy * proxy,
94
 
                                                  gchar * path, GHashTable * info,
 
87
static void ubuntuone_nautilus_upload_finished (SyncdaemonDaemon *daemon,
 
88
                                                 gchar * path,
 
89
                                                SyncdaemonTransferInfo * info,
 
90
                                                 gpointer user_data);
 
91
static void ubuntuone_nautilus_download_started (SyncdaemonDaemon *daemon,
 
92
                                                 gchar * path,
 
93
                                                 gpointer user_data);
 
94
static void ubuntuone_nautilus_download_finished (SyncdaemonDaemon *daemon,
 
95
                                                  gchar * path,
 
96
                                                  SyncdaemonTransferInfo * info,
95
97
                                                  gpointer user_data);
96
98
static void ubuntuone_nautilus_udf_created (DBusGProxy * proxy,
97
99
                                            GHashTable * hash,
747
749
  }
748
750
 
749
751
  uon->syncdaemon = syncdaemon_daemon_new ();
750
 
  uon->u1_status = dbus_g_proxy_new_for_name (uon->bus,
751
 
                                              "com.ubuntuone.SyncDaemon",
752
 
                                              "/status",
753
 
                                              "com.ubuntuone.SyncDaemon.Status");
754
752
  uon->u1_shares = dbus_g_proxy_new_for_name (uon->bus,
755
753
                                              "com.ubuntuone.SyncDaemon",
756
754
                                              "/shares",
799
797
                                     G_TYPE_STRING,
800
798
                                     G_TYPE_INVALID);
801
799
 
802
 
  dbus_g_proxy_add_signal (uon->u1_status, "StatusChanged",
803
 
                           dbus_g_type_get_map ("GHashTable",
804
 
                                                G_TYPE_STRING,
805
 
                                                G_TYPE_STRING),
806
 
                           G_TYPE_INVALID);
807
 
  dbus_g_proxy_connect_signal (uon->u1_status, "StatusChanged",
808
 
                               G_CALLBACK(ubuntuone_nautilus_status_changed),
809
 
                               uon, NULL);
 
800
  g_signal_connect (G_OBJECT (uon->syncdaemon), "status_changed",
 
801
                    G_CALLBACK (ubuntuone_nautilus_status_changed), uon);
 
802
  g_signal_connect (G_OBJECT (uon->syncdaemon), "upload_started",
 
803
                    G_CALLBACK (ubuntuone_nautilus_upload_started), uon);
 
804
  g_signal_connect (G_OBJECT (uon->syncdaemon), "upload_finished",
 
805
                    G_CALLBACK (ubuntuone_nautilus_upload_finished), uon);
 
806
  g_signal_connect (G_OBJECT (uon->syncdaemon), "download_started",
 
807
                    G_CALLBACK (ubuntuone_nautilus_download_started), uon);
 
808
  g_signal_connect (G_OBJECT (uon->syncdaemon), "download_finished",
 
809
                    G_CALLBACK (ubuntuone_nautilus_download_finished), uon);
810
810
 
811
 
  dbus_g_proxy_add_signal (uon->u1_status, "UploadStarted",
812
 
                           G_TYPE_STRING,
813
 
                           G_TYPE_INVALID);
814
 
  dbus_g_proxy_connect_signal (uon->u1_status, "UploadStarted",
815
 
                               G_CALLBACK (ubuntuone_nautilus_upload_started),
816
 
                               uon, NULL);
817
 
  dbus_g_proxy_add_signal (uon->u1_status, "UploadFinished",
818
 
                           G_TYPE_STRING,
819
 
                           dbus_g_type_get_map ("GHashTable",
820
 
                                                G_TYPE_STRING,
821
 
                                                G_TYPE_STRING),
822
 
                           G_TYPE_INVALID);
823
 
  dbus_g_proxy_connect_signal (uon->u1_status, "UploadFinished",
824
 
                               G_CALLBACK (ubuntuone_nautilus_upload_finished),
825
 
                               uon, NULL);
826
 
  dbus_g_proxy_add_signal (uon->u1_status, "DownloadStarted",
827
 
                           G_TYPE_STRING,
828
 
                           G_TYPE_INVALID);
829
 
  dbus_g_proxy_connect_signal (uon->u1_status, "DownloadStarted",
830
 
                               G_CALLBACK (ubuntuone_nautilus_download_started),
831
 
                               uon, NULL);
832
 
  dbus_g_proxy_add_signal (uon->u1_status, "DownloadFinished",
833
 
                           G_TYPE_STRING,
834
 
                           dbus_g_type_get_map ("GHashTable",
835
 
                                                G_TYPE_STRING,
836
 
                                                G_TYPE_STRING),
837
 
                           G_TYPE_INVALID);
838
 
  dbus_g_proxy_connect_signal (uon->u1_status, "DownloadFinished",
839
 
                               G_CALLBACK (ubuntuone_nautilus_download_finished),
840
 
                               uon, NULL);
841
811
  dbus_g_proxy_add_signal (uon->u1_shares, "ShareCreated",
842
812
                           dbus_g_type_get_map ("GHashTable",
843
813
                                                G_TYPE_STRING,
949
919
  if (uon->syncdaemon)
950
920
    g_object_unref (uon->syncdaemon);
951
921
 
952
 
  if (uon->u1_status)
953
 
    g_object_unref (uon->u1_status);
954
 
 
955
922
  if (uon->u1_shares)
956
923
    g_object_unref (uon->u1_shares);
957
924
 
1152
1119
  g_slist_free (data);
1153
1120
}
1154
1121
 
1155
 
static void ubuntuone_nautilus_status_changed (DBusGProxy * proxy,
1156
 
                                               GHashTable * hash,
 
1122
static void ubuntuone_nautilus_status_changed (SyncdaemonDaemon *daemon,
 
1123
                                               SyncdaemonStatusInfo *status_info,
1157
1124
                                               gpointer user_data) {
1158
1125
  UbuntuOneNautilus * uon = UBUNTUONE_NAUTILUS (user_data);
1159
 
  gchar * status;
 
1126
  const gchar * status;
1160
1127
  gboolean is_online;
1161
1128
 
1162
 
  is_online = g_strcmp0(g_hash_table_lookup (hash, "is_online"), "True") == 0;
1163
 
  status = g_hash_table_lookup (hash, "name");
 
1129
  is_online = syncdaemon_status_info_get_online (status_info);
 
1130
  status = syncdaemon_status_info_get_name (status_info);
1164
1131
 
1165
1132
  /* Get the root when we get a status change signal, if we haven't yet */
1166
1133
  if (!uon->gotroot) {
1187
1154
  }
1188
1155
}
1189
1156
 
1190
 
static void ubuntuone_nautilus_upload_started (DBusGProxy * proxy,
 
1157
static void ubuntuone_nautilus_upload_started (SyncdaemonDaemon *daemon,
1191
1158
                                               gchar * path,
1192
1159
                                               gpointer user_data) {
1193
1160
  UbuntuOneNautilus * uon = UBUNTUONE_NAUTILUS (user_data);
1199
1166
  }
1200
1167
}
1201
1168
 
1202
 
static void ubuntuone_nautilus_upload_finished (DBusGProxy * proxy,
1203
 
                                                gchar * path, GHashTable * info,
 
1169
static void ubuntuone_nautilus_upload_finished (SyncdaemonDaemon *daemon,
 
1170
                                                gchar * path,
 
1171
                                                SyncdaemonTransferInfo * info,
1204
1172
                                                gpointer user_data) {
1205
1173
  UbuntuOneNautilus * uon = UBUNTUONE_NAUTILUS (user_data);
1206
1174
  gchar * new_path;
1214
1182
  ubuntuone_nautilus_reset_emblem (uon, path);
1215
1183
}
1216
1184
 
1217
 
static void ubuntuone_nautilus_download_started (DBusGProxy * proxy,
 
1185
static void ubuntuone_nautilus_download_started (SyncdaemonDaemon *daemon,
1218
1186
                                                 gchar * path,
1219
1187
                                                 gpointer user_data) {
1220
1188
  UbuntuOneNautilus * uon = UBUNTUONE_NAUTILUS (user_data);
1226
1194
  }
1227
1195
}
1228
1196
 
1229
 
static void ubuntuone_nautilus_download_finished (DBusGProxy * proxy,
 
1197
static void ubuntuone_nautilus_download_finished (SyncdaemonDaemon *daemon,
1230
1198
                                                  gchar * path,
1231
 
                                                  GHashTable * info,
 
1199
                                                  SyncdaemonTransferInfo * info,
1232
1200
                                                  gpointer user_data) {
1233
1201
  UbuntuOneNautilus * uon = UBUNTUONE_NAUTILUS (user_data);
1234
1202
  gchar * new_path;