r7195 - in dumbhippo/trunk/client: common/hippo linux/src

[commits mugshot org]

Author: otaylor
Date: 2008-01-14 10:49:53 -0600 (Mon, 14 Jan 2008)
New Revision: 7195

Modified:
   dumbhippo/trunk/client/common/hippo/hippo-stacker-platform.c
   dumbhippo/trunk/client/common/hippo/hippo-stacker-platform.h
   dumbhippo/trunk/client/linux/src/hippo-stacker-platform-impl.c
   dumbhippo/trunk/client/linux/src/hippo-status-icon.c
Log:
Remove the problematical hippo_stacker_platform_show_disconnected_window()

Modified: dumbhippo/trunk/client/common/hippo/hippo-stacker-platform.c
===================================================================
--- dumbhippo/trunk/client/common/hippo/hippo-stacker-platform.c	2008-01-14 16:27:54 UTC (rev 7194)
+++ dumbhippo/trunk/client/common/hippo/hippo-stacker-platform.c	2008-01-14 16:49:53 UTC (rev 7195)
@@ -107,18 +107,3 @@
 
     return HIPPO_STACKER_PLATFORM_GET_CLASS(platform)->get_chat_window_state(platform, chat_id);
 }
-
-void
-hippo_stacker_platform_show_disconnected_window (HippoStackerPlatform *platform,
-                                                 HippoConnection      *connection)
-{
-    HippoStackerPlatformClass *klass;
-    
-    g_return_if_fail(HIPPO_IS_STACKER_PLATFORM(platform));
-
-    klass = HIPPO_STACKER_PLATFORM_GET_CLASS(platform);
-    
-    if (klass->show_disconnected_window != NULL) {
-        (* klass->show_disconnected_window) (platform, connection);
-    }
-}

Modified: dumbhippo/trunk/client/common/hippo/hippo-stacker-platform.h
===================================================================
--- dumbhippo/trunk/client/common/hippo/hippo-stacker-platform.h	2008-01-14 16:27:54 UTC (rev 7194)
+++ dumbhippo/trunk/client/common/hippo/hippo-stacker-platform.h	2008-01-14 16:49:53 UTC (rev 7195)
@@ -46,9 +46,6 @@
     
     gboolean (* can_play_song_download) (HippoStackerPlatform *platform,
                                          HippoSongDownload    *song_download);
-    
-    void (* show_disconnected_window) (HippoStackerPlatform   *platform,
-                                       HippoConnection *connection);
 };
 
 GType            hippo_stacker_platform_get_type               (void) G_GNUC_CONST;
@@ -83,9 +80,6 @@
 
 gboolean         hippo_stacker_platform_can_play_song_download (HippoStackerPlatform   *platform,
                                                                 HippoSongDownload      *song_download);
-
-void             hippo_stacker_platform_show_disconnected_window (HippoStackerPlatform *platform,
-                                                                  HippoConnection      *connection);
     
 G_END_DECLS
 

Modified: dumbhippo/trunk/client/linux/src/hippo-stacker-platform-impl.c
===================================================================
--- dumbhippo/trunk/client/linux/src/hippo-stacker-platform-impl.c	2008-01-14 16:27:54 UTC (rev 7194)
+++ dumbhippo/trunk/client/linux/src/hippo-stacker-platform-impl.c	2008-01-14 16:49:53 UTC (rev 7195)
@@ -36,9 +36,8 @@
 
 static gboolean     hippo_stacker_platform_impl_can_play_song_download (HippoStackerPlatform     *platform,
                                                                         HippoSongDownload        *song_download);
-static void         hippo_stacker_platform_impl_show_disconnected_window (HippoStackerPlatform *platform,
-                                                                          HippoConnection      *connection);
 
+#if 0
 typedef struct Dialogs Dialogs;
 
 static Dialogs* dialogs_get                        (HippoConnection *connection);
@@ -49,8 +48,8 @@
                                                     gboolean         show_if_not_showing);
 static void     dialogs_update_status              (Dialogs         *dialogs,
                                                     gboolean         show_if_not_showing);
+#endif
 
-
 struct _HippoStackerPlatformImpl {
     GObject parent;
     HippoInstanceType instance;
@@ -75,7 +74,6 @@
     klass->show_chat_window = hippo_stacker_platform_impl_show_chat_window;
     klass->get_chat_window_state = hippo_stacker_platform_impl_get_chat_window_state;
     klass->can_play_song_download = hippo_stacker_platform_impl_can_play_song_download;
-    klass->show_disconnected_window = hippo_stacker_platform_impl_show_disconnected_window;
 }
 
 static void
@@ -185,18 +183,7 @@
     return TRUE;
 }
 
-static void
-hippo_stacker_platform_impl_show_disconnected_window(HippoStackerPlatform   *platform,
-                                                     HippoConnection *connection)
-{
-    /* HippoStackerPlatformImpl *impl = HIPPO_STACKER_PLATFORM_IMPL(platform); */
-    Dialogs *dialogs;
-
-    dialogs = dialogs_get(connection);
-    
-    dialogs_update_disconnected_window(dialogs, TRUE);
-}
-
+#if 0
 /* We want to show either a login dialog or a dialog with connection status
  * when the tray icon is clicked but we aren't signed in
  */
@@ -413,3 +400,4 @@
     if (dialogs->connection_status_dialog)
         gtk_window_present(GTK_WINDOW(dialogs->connection_status_dialog));
 }
+#endif

Modified: dumbhippo/trunk/client/linux/src/hippo-status-icon.c
===================================================================
--- dumbhippo/trunk/client/linux/src/hippo-status-icon.c	2008-01-14 16:27:54 UTC (rev 7194)
+++ dumbhippo/trunk/client/linux/src/hippo-status-icon.c	2008-01-14 16:49:53 UTC (rev 7195)
@@ -123,8 +123,11 @@
 
         connection = hippo_data_cache_get_connection(icon->cache);
         if (!hippo_connection_get_connected(connection)) {
+#if 0
+            /* FIXME: Implement this getting the necessary information via the data model */
             HippoStackerPlatform *platform = hippo_app_get_stacker_platform(hippo_get_app());
             hippo_stacker_platform_show_disconnected_window(platform, connection);
+#endif            
         } else {
             /* the UI has to exist since we (the tray icon) are part of it */
             HippoStackManager *stack_manager = hippo_app_get_stack(hippo_get_app());