[cheese/cheese-window-refactor: 4/9] Restore temporarily disabled dbus code

[Filippo Argiolas <fargiolas src gnome org>]

commit c79884ae0496f565a768e7bdeec067b31df3b316
Author: Filippo Argiolas <filippo argiolas gmail com>
Date:   Wed Jan 27 18:49:02 2010 +0100

    Restore temporarily disabled dbus code
    
    We should really remove dbus stuff. We agreed to use libcheese for
    interoperation with the desktop so we're keeping it just for the single
    instance stuff. Probably gunique would be better suited for it.
    The best would be to make CheeseCameraDevice aware of device locking so
    we wouldn't need to be single instance anymore.

 src/cheese-dbus.c   |   11 +++++------
 src/cheese-dbus.h   |    3 ++-
 src/cheese-window.c |   18 +++++++-----------
 src/cheese-window.h |    8 +-------
 src/cheese.c        |   15 ++++++---------
 5 files changed, 21 insertions(+), 34 deletions(-)
---
diff --git a/src/cheese-dbus.c b/src/cheese-dbus.c
index 161f339..fb03938 100644
--- a/src/cheese-dbus.c
+++ b/src/cheese-dbus.c
@@ -32,24 +32,23 @@
 #include <stdlib.h>
 #include <gtk/gtk.h>
 #include "cheese-dbus.h"
-#include "cheese-window.h"
 #include "cheese-dbus-infos.h"
 
-gpointer window_pointer;
+CheeseWindow *window_pointer = NULL;
 
 G_DEFINE_TYPE (CheeseDbus, cheese_dbus, G_TYPE_OBJECT);
 
 void
-cheese_dbus_set_window (gpointer data)
+cheese_dbus_set_window (CheeseWindow *window)
 {
-  if (data != NULL)
-    window_pointer = data;
+  if (window != NULL)
+    window_pointer = window;
 }
 
 gboolean
 cheese_dbus_notify ()
 {
-//  cheese_window_bring_to_front (window_pointer);
+  cheese_window_bring_to_front (window_pointer);
   return TRUE;
 }
 
diff --git a/src/cheese-dbus.h b/src/cheese-dbus.h
index 9114a31..5e77740 100644
--- a/src/cheese-dbus.h
+++ b/src/cheese-dbus.h
@@ -24,6 +24,7 @@
 
 #include <dbus/dbus-glib.h>
 #include <glib.h>
+#include "cheese-window.h"
 
 G_BEGIN_DECLS
 
@@ -49,7 +50,7 @@ typedef struct _CheeseDbus
 GType       cheese_dbus_get_type (void);
 CheeseDbus *cheese_dbus_new (void);
 
-void     cheese_dbus_set_window (gpointer);
+void     cheese_dbus_set_window (CheeseWindow *window);
 gboolean cheese_dbus_notify (void);
 
 G_END_DECLS
diff --git a/src/cheese-window.c b/src/cheese-window.c
index 32aecdc..27f7e8a 100644
--- a/src/cheese-window.c
+++ b/src/cheese-window.c
@@ -56,6 +56,11 @@
 #define DEFAULT_WINDOW_WIDTH       600
 #define DEFAULT_WINDOW_HEIGHT      450
 
+enum
+{
+  PROP_0,
+};
+
 typedef enum
 {
   CAMERA_MODE_PHOTO,
@@ -298,12 +303,10 @@ cheese_window_spinner_invert (GtkWidget *spinner, GtkWidget *parent)
   }
 }
 
-#if 0
 void
-cheese_window_bring_to_front (gpointer data)
+cheese_window_bring_to_front (CheeseWindow *window)
 {
-  CheeseWindow *cheese_window     = data;
-  CheeseWindowPrivate *priv = CHEESE_WINDOW_GET_PRIVATE (cheese_window);
+  CheeseWindowPrivate *priv = CHEESE_WINDOW_GET_PRIVATE (window);
   guint32       startup_timestamp = gdk_x11_get_server_time (gtk_widget_get_window (GTK_WIDGET (window)));
 
   gdk_x11_window_set_user_time (gtk_widget_get_window (GTK_WIDGET (window)), startup_timestamp);
@@ -311,8 +314,6 @@ cheese_window_bring_to_front (gpointer data)
   gtk_window_present (GTK_WINDOW (window));
 }
 
-#endif
-
 static gboolean
 cheese_window_key_press_event_cb (GtkWidget *win, GdkEventKey *event, CheeseWindow *cheese_window)
 {
@@ -1523,11 +1524,6 @@ cheese_window_init (CheeseWindow *window)
   priv->isFullscreen        = FALSE;
   priv->is_bursting         = FALSE;
 
-//  priv->server = dbus_server;
-#if 0
-  /* save a pointer to the cheese window in cheese dbus */
-  cheese_dbus_set_window (cheese_window);
-#endif
   priv->fullscreen_timeout_source = NULL;
 
   cheese_window_create_window (window);
diff --git a/src/cheese-window.h b/src/cheese-window.h
index 9a88127..a18834d 100644
--- a/src/cheese-window.h
+++ b/src/cheese-window.h
@@ -22,7 +22,6 @@
 #define __CHEESE_WINDOW_H__
 
 #include <gtk/gtk.h>
-#include "cheese-dbus.h"
 #include "cheese-camera.h"
 #include "cheese-gconf.h"
 #include "cheese-thumb-view.h"
@@ -51,6 +50,7 @@ GType cheese_window_get_type (void) G_GNUC_CONST;
 
 /* public methods */
 CheeseWindow *cheese_window_new (void);
+void cheese_window_bring_to_front (CheeseWindow *window);
 CheeseThumbView *cheese_window_get_thumbview (CheeseWindow *window);
 CheeseCamera * cheese_window_get_camera (CheeseWindow *window);
 CheeseGConf *cheese_window_get_gconf (CheeseWindow *window);
@@ -64,10 +64,4 @@ void cheese_window_toggle_fullscreen (GtkWidget *widget, CheeseWindow *cheese_wi
 void cheese_window_toggle_wide_mode (GtkWidget *widget, CheeseWindow *cheese_window);
 void cheese_window_action_button_clicked_cb (GtkWidget *widget, CheeseWindow *cheese_window);
 
-
-#if 0
-void cheese_window_init (char *hal_dev_udi, CheeseDbus *dbus_server, gboolean startup_in_wide_mode);
-void cheese_window_bring_to_front (gpointer data);
-#endif
-
 #endif /* __CHEESE_WINDOW_H__ */
diff --git a/src/cheese.c b/src/cheese.c
index 95479db..2eeacf4 100644
--- a/src/cheese.c
+++ b/src/cheese.c
@@ -31,13 +31,12 @@
 
 #include "cheese-fileutil.h"
 #include "cheese-window.h"
-//#include "cheese-dbus.h"
+#include "cheese-dbus.h"
 
 struct _CheeseOptions
 {
   gboolean verbose;
   gboolean wide_mode;
-  char *hal_device_id;
   gboolean version;
 } CheeseOptions;
 
@@ -97,15 +96,11 @@ main (int argc, char **argv)
      _("Be verbose"), NULL},
     {"wide",       'w', 0,                    G_OPTION_ARG_NONE,   &CheeseOptions.wide_mode,
      _("Enable wide mode"), NULL},
-    {"hal-device", 'd', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_STRING, &CheeseOptions.hal_device_id,
-     NULL, NULL},
     {"version",    0,   0,                    G_OPTION_ARG_NONE,   &CheeseOptions.version,
      _("output version information and exit"), NULL},
     {NULL}
   };
 
-  CheeseOptions.hal_device_id = NULL;
-
   bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALEDIR);
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
   textdomain (GETTEXT_PACKAGE);
@@ -138,14 +133,12 @@ main (int argc, char **argv)
     return 0;
   }
 
-#if 0
   dbus_server = cheese_dbus_new ();
   if (dbus_server == NULL)
   {
     gdk_notify_startup_complete ();
     return -1;
   }
-#endif
 
   g_set_print_handler ((GPrintFunc) cheese_print_handler);
   g_print ("Cheese " VERSION " \n");
@@ -154,7 +147,11 @@ main (int argc, char **argv)
   gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
                                      APPNAME_DATA_DIR G_DIR_SEPARATOR_S "icons");
 
-  CheeseWindow *window = g_object_new (CHEESE_TYPE_WINDOW, NULL);
+  CheeseWindow *window = g_object_new (CHEESE_TYPE_WINDOW,
+                                       NULL);
+
+  cheese_dbus_set_window (window);
+
   gtk_widget_show (GTK_WIDGET (window));
 
   gdk_threads_enter ();