[gnac/devel: 2/3] Merge branch 'libunique' into devel

[David Joaquim <djoaquim src gnome org>]

commit d265013c26963a47a6d55319da4ae7679fcf9fea
Merge: 6bac2de 21bc367
Author: David Joaquim <djoaquim src gnome org>
Date:   Wed Jun 9 21:50:11 2010 +0200

    Merge branch 'libunique' into devel
    
    Conflicts:
    	src/gnac-ui.c
    	src/gnac-ui.h

 configure.ac       |    6 +++
 src/Makefile.am    |    2 +
 src/gnac-main.c    |    2 +
 src/gnac-options.c |   56 +++++++++++++++--------
 src/gnac-options.h |    9 ++++
 src/gnac-ui.c      |  123 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 src/gnac-ui.h      |    3 +
 src/gnac-utils.c   |   32 +++++++++++++
 src/gnac-utils.h   |    4 ++
 9 files changed, 216 insertions(+), 21 deletions(-)
---
diff --cc src/gnac-ui.c
index 07204ae,74be15f..68cc922
--- a/src/gnac-ui.c
+++ b/src/gnac-ui.c
@@@ -27,9 -27,9 +27,10 @@@
  #include "config.h"
  #endif /* HAVE_CONFIG_H */
  
 +#include <gdk/gdkkeysyms.h>
  #include <glib/gi18n.h>
  #include <glib/gprintf.h>
+ #include <unique/unique.h>
  
  #include "gnac-bars.h"
  #include "gnac-file-list.h"
@@@ -41,14 -42,12 +43,16 @@@
  #include "profiles/gnac-profiles.h"
  
  extern GnacState state;
+ extern guint nb_files_added;
  extern LibgnacMetadata *metadata;
  
 +static GSList         *filters;
  static GtkBuilder     *gnac_main_builder = NULL;
 +static GtkFileFilter  *default_file_filter;
  static GtkStatusIcon  *trayicon = NULL;
 +static GtkWidget      *gnac_file_chooser;
 +static gchar          *current_directory;
+ static UniqueApp      *app;
  static gchar          *status_msg = NULL;
  static gchar          *tooltip_path = NULL;
  static gchar          *progress_msg = NULL;
diff --cc src/gnac-ui.h
index 4a05701,09144a4..00c1ce7
--- a/src/gnac-ui.h
+++ b/src/gnac-ui.h
@@@ -67,34 -69,7 +69,35 @@@ voi
  gnac_ui_show_about_dialog(void);
  
  void
 +gnac_ui_reset_file_filter(void);
 +
 +GtkWidget *
 +gnac_ui_get_file_chooser(void);
 +
 +GtkFileFilter *
 +gnac_ui_get_current_filter(void);
 +
 +GtkFileFilter *
 +gnac_ui_get_default_filter(void);
 +
 +void
 +gnac_ui_on_filter_changed(GtkComboBox *combo,
 +                          gpointer     user_data);
 +
 +void
 +gnac_ui_file_chooser_response_cb(GtkDialog *dialog,
 +                                 gint       response,
 +                                 gpointer   user_data);
 +
 +void
 +gnac_ui_file_chooser_file_activated_cb(GtkFileChooser *chooser,
 +                                       gpointer        user_data);
 +
 +gboolean
 +gnac_ui_file_chooser_key_press_event_cb(GtkWidget   *widget,
 +                                        GdkEventKey *event,
 +                                        gpointer     user_data);
+ gnac_ui_init_unique(GnacCmdLineOptions *options);
  
  void
  gnac_ui_new(void);