Commit 7796eba7 authored by Pierre Wieser's avatar Pierre Wieser

Fix glade regression

parent e42d3ad4
......@@ -3,6 +3,7 @@
.project
.deps/
.libs/
.install/
Makefile
Makefile.in
aclocal.m4
......
......@@ -23,9 +23,7 @@
# Frederic Ruaudel <grumz@grumz.net>
# Rodrigo Moya <rodrigo@gnome-db.org>
# Pierre Wieser <pwieser@trychlos.org>
# and many others (see AUTHORS)
#
# pwi 2009-05-16 add distcheck_configure_flags and distcleanfiles
# ... and many others (see AUTHORS)
ACLOCAL_AMFLAGS = -I m4
......
......@@ -23,14 +23,11 @@
# Frederic Ruaudel <grumz@grumz.net>
# Rodrigo Moya <rodrigo@gnome-db.org>
# Pierre Wieser <pwieser@trychlos.org>
# and many others (see AUTHORS)
#
# pwi 2009-05-16 created from configure.in
# ... and many others (see AUTHORS)
AC_PREREQ([2.53])
# Caution: 1.11 is unstable/development version
AC_INIT([nautilus-actions],[1.11],[maintainer@nautilus-actions.org])
AC_INIT([nautilus-actions],[1.10.1],[maintainer@nautilus-actions.org])
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE
......@@ -56,7 +53,7 @@ AC_CONFIG_FILES([
AC_CONFIG_MACRO_DIR([m4])
# pwi 2009-05-15 disabled as useless or badly explained
# pwi 2009-05-15 disabled as GNOME_COMMON_INIT takes care if that
#AC_SUBST(ACLOCAL_AMFLAGS, "$ACLOCAL_FLAGS")
# don't agree with maintainer mode use
......@@ -147,6 +144,9 @@ NACT_NAUTILUS_EXTDIR
# building or not the commandline tools
NACT_COMMANDLINE_TOOLS
# define NACT_MAINTAINER_MODE variable
NACT_IS_MAINTAINER_MODE
# Check for menu update function
AC_CHECK_LIB(nautilus-extension, nautilus_menu_item_new)
AC_CHECK_FUNCS(nautilus_menu_provider_emit_items_updated_signal)
......
......@@ -23,9 +23,7 @@
# Frederic Ruaudel <grumz@grumz.net>
# Rodrigo Moya <rodrigo@gnome-db.org>
# Pierre Wieser <pwieser@trychlos.org>
# and many others (see AUTHORS)
#
# pwi 2009-05-16 fix to make distcheck successfully
# ... and many others (see AUTHORS)
icondir = $(datadir)/icons/hicolor/16x16/apps
......
......@@ -23,9 +23,7 @@
# Frederic Ruaudel <grumz@grumz.net>
# Rodrigo Moya <rodrigo@gnome-db.org>
# Pierre Wieser <pwieser@trychlos.org>
# and many others (see AUTHORS)
#
# pwi 2009-05-16 fix to make distcheck successfully
# ... and many others (see AUTHORS)
icondir = $(datadir)/icons/hicolor/22x22/apps
......
......@@ -23,9 +23,7 @@
# Frederic Ruaudel <grumz@grumz.net>
# Rodrigo Moya <rodrigo@gnome-db.org>
# Pierre Wieser <pwieser@trychlos.org>
# and many others (see AUTHORS)
#
# pwi 2009-05-16 fix to make distcheck successfully
# ... and many others (see AUTHORS)
icondir = $(datadir)/icons/hicolor/32x32/apps
......
......@@ -23,9 +23,7 @@
# Frederic Ruaudel <grumz@grumz.net>
# Rodrigo Moya <rodrigo@gnome-db.org>
# Pierre Wieser <pwieser@trychlos.org>
# and many others (see AUTHORS)
#
# pwi 2009-05-16 fix to make distcheck successfully
# ... and many others (see AUTHORS)
icondir = $(datadir)/icons/hicolor/48x48/apps
......
......@@ -23,9 +23,7 @@
# Frederic Ruaudel <grumz@grumz.net>
# Rodrigo Moya <rodrigo@gnome-db.org>
# Pierre Wieser <pwieser@trychlos.org>
# and many others (see AUTHORS)
#
# pwi 2009-05-16 fix to make distcheck successfully
# ... and many others (see AUTHORS)
SUBDIRS = \
16x16 \
......
......@@ -23,9 +23,7 @@
# Frederic Ruaudel <grumz@grumz.net>
# Rodrigo Moya <rodrigo@gnome-db.org>
# Pierre Wieser <pwieser@trychlos.org>
# and many others (see AUTHORS)
#
# pwi 2009-05-16 fix to make distcheck successfully
# ... and many others (see AUTHORS)
svgicondir = $(datadir)/icons/hicolor/scalable/apps
......
......@@ -23,9 +23,7 @@
# Frederic Ruaudel <grumz@grumz.net>
# Rodrigo Moya <rodrigo@gnome-db.org>
# Pierre Wieser <pwieser@trychlos.org>
# and many others (see AUTHORS)
#
# pwi 2009-05-16 replace INCLUDES by AM_CPPFLAGS
# ... and many others (see AUTHORS)
noinst_LTLIBRARIES = libnautilus-actions.la
......
......@@ -24,9 +24,7 @@
* Frederic Ruaudel <grumz@grumz.net>
* Rodrigo Moya <rodrigo@gnome-db.org>
* Pierre Wieser <pwieser@trychlos.org>
* and many others (see AUTHORS)
*
* pwi 2009-05-17 make the source ansi-compliant
* ... and many others (see AUTHORS)
*/
#include <config.h>
......
......@@ -24,10 +24,7 @@
* Frederic Ruaudel <grumz@grumz.net>
* Rodrigo Moya <rodrigo@gnome-db.org>
* Pierre Wieser <pwieser@trychlos.org>
* and many others (see AUTHORS)
*
* pwi 2009-05-16 fix compilation warnings
* pwi 2009-05-17 make the source ansi-compliant
* ... and many others (see AUTHORS)
*/
#include <config.h>
......
......@@ -24,9 +24,7 @@
* Frederic Ruaudel <grumz@grumz.net>
* Rodrigo Moya <rodrigo@gnome-db.org>
* Pierre Wieser <pwieser@trychlos.org>
* and many others (see AUTHORS)
*
* pwi 2009-05-17 make the source ansi-compliant
* ... and many others (see AUTHORS)
*/
#ifndef __NAUTILUS_ACTIONS_CONFIG_GCONF_READER_H__
......
......@@ -24,9 +24,7 @@
* Frederic Ruaudel <grumz@grumz.net>
* Rodrigo Moya <rodrigo@gnome-db.org>
* Pierre Wieser <pwieser@trychlos.org>
* and many others (see AUTHORS)
*
* pwi 2009-05-17 make the source ansi-compliant
* ... and many others (see AUTHORS)
*/
#include <config.h>
......
......@@ -24,9 +24,7 @@
* Frederic Ruaudel <grumz@grumz.net>
* Rodrigo Moya <rodrigo@gnome-db.org>
* Pierre Wieser <pwieser@trychlos.org>
* and many others (see AUTHORS)
*
* pwi 2009-05-17 make the source ansi-compliant
* ... and many others (see AUTHORS)
*/
#ifndef __NAUTILUS_ACTIONS_CONFIG_GCONF_WRITER_H__
......
......@@ -24,9 +24,7 @@
* Frederic Ruaudel <grumz@grumz.net>
* Rodrigo Moya <rodrigo@gnome-db.org>
* Pierre Wieser <pwieser@trychlos.org>
* and many others (see AUTHORS)
*
* pwi 2009-05-17 make the source ansi-compliant
* ... and many others (see AUTHORS)
*/
#include <config.h>
......
......@@ -24,9 +24,7 @@
* Frederic Ruaudel <grumz@grumz.net>
* Rodrigo Moya <rodrigo@gnome-db.org>
* Pierre Wieser <pwieser@trychlos.org>
* and many others (see AUTHORS)
*
* pwi 2009-05-17 make the source ansi-compliant
* ... and many others (see AUTHORS)
*/
#ifndef __NAUTILUS_ACTIONS_CONFIG_GCONF_H__
......
......@@ -24,10 +24,7 @@
* Frederic Ruaudel <grumz@grumz.net>
* Rodrigo Moya <rodrigo@gnome-db.org>
* Pierre Wieser <pwieser@trychlos.org>
* and many others (see AUTHORS)
*
* pwi 2009-05-16 fix compilation warnings
* pwi 2009-05-17 make the source ansi-compliant
* ... and many others (see AUTHORS)
*/
#include <config.h>
......
......@@ -24,9 +24,7 @@
* Frederic Ruaudel <grumz@grumz.net>
* Rodrigo Moya <rodrigo@gnome-db.org>
* Pierre Wieser <pwieser@trychlos.org>
* and many others (see AUTHORS)
*
* pwi 2009-05-17 make the source ansi-compliant
* ... and many others (see AUTHORS)
*/
#ifndef __NAUTILUS_ACTIONS_CONFIG_SCHEMA_READER_H__
......
......@@ -24,9 +24,7 @@
* Frederic Ruaudel <grumz@grumz.net>
* Rodrigo Moya <rodrigo@gnome-db.org>
* Pierre Wieser <pwieser@trychlos.org>
* and many others (see AUTHORS)
*
* pwi 2009-05-17 make the source ansi-compliant
* ... and many others (see AUTHORS)
*/
#include <config.h>
......
......@@ -24,9 +24,7 @@
* Frederic Ruaudel <grumz@grumz.net>
* Rodrigo Moya <rodrigo@gnome-db.org>
* Pierre Wieser <pwieser@trychlos.org>
* and many others (see AUTHORS)
*
* pwi 2009-05-17 make the source ansi-compliant
* ... and many others (see AUTHORS)
*/
#ifndef __NAUTILUS_ACTIONS_CONFIG_SCHEMA_WRITER_H__
......
......@@ -24,9 +24,7 @@
* Frederic Ruaudel <grumz@grumz.net>
* Rodrigo Moya <rodrigo@gnome-db.org>
* Pierre Wieser <pwieser@trychlos.org>
* and many others (see AUTHORS)
*
* pwi 2009-05-16 fix compilation warnings
* ... and many others (see AUTHORS)
*/
#include <config.h>
......
......@@ -24,9 +24,7 @@
* Frederic Ruaudel <grumz@grumz.net>
* Rodrigo Moya <rodrigo@gnome-db.org>
* Pierre Wieser <pwieser@trychlos.org>
* and many others (see AUTHORS)
*
* pwi 2009-05-17 make the source ansi-compliant
* ... and many others (see AUTHORS)
*/
#ifndef __NAUTILUS_ACTIONS_CONFIG_H__
......
......@@ -23,6 +23,4 @@
# Frederic Ruaudel <grumz@grumz.net>
# Rodrigo Moya <rodrigo@gnome-db.org>
# Pierre Wieser <pwieser@trychlos.org>
# and many others (see AUTHORS)
#
# pwi 2009-05-16 creation
# ... and many others (see AUTHORS)
......@@ -23,9 +23,7 @@
# Frederic Ruaudel <grumz@grumz.net>
# Rodrigo Moya <rodrigo@gnome-db.org>
# Pierre Wieser <pwieser@trychlos.org>
# and many others (see AUTHORS)
#
# pwi 2009-05-16 creation
# ... and many others (see AUTHORS)
# serial 1 creation
......
......@@ -23,9 +23,7 @@
# Frederic Ruaudel <grumz@grumz.net>
# Rodrigo Moya <rodrigo@gnome-db.org>
# Pierre Wieser <pwieser@trychlos.org>
# and many others (see AUTHORS)
#
# pwi 2009-05-16 creation
# ... and many others (see AUTHORS)
# serial 1 creation
......
......@@ -23,9 +23,7 @@
# Frederic Ruaudel <grumz@grumz.net>
# Rodrigo Moya <rodrigo@gnome-db.org>
# Pierre Wieser <pwieser@trychlos.org>
# and many others (see AUTHORS)
#
# pwi 2009-05-16 replace INCLUDES by AM_CPPFLAGS
# ... and many others (see AUTHORS)
bin_PROGRAMS = \
nautilus-actions-config
......
......@@ -24,10 +24,7 @@
* Frederic Ruaudel <grumz@grumz.net>
* Rodrigo Moya <rodrigo@gnome-db.org>
* Pierre Wieser <pwieser@trychlos.org>
* and many others (see AUTHORS)
*
* pwi 2009-05-16 fix compilation warnings
* pwi 2009-05-17 make the source ansi-compliant
* ... and many others (see AUTHORS)
*/
#include <string.h>
......@@ -42,7 +39,16 @@
#include "nact-prefs.h"
#include "nact.h"
static void field_changed_cb (GObject *object, gpointer user_data);
/* gui callback functions */
void icon_browse_button_clicked_cb (GtkButton *button, gpointer user_data);
void field_changed_cb (GObject *object, gpointer user_data);
void delete_prof_button_clicked_cb (GtkButton *button, gpointer user_data);
void paste_prof_button_clicked_cb (GtkButton *button, gpointer user_data);
void add_prof_button_clicked_cb (GtkButton *button, gpointer user_data);
void copy_prof_button_clicked_cb (GtkButton *button, gpointer user_data);
void edit_prof_button_clicked_cb (GtkButton *button, gpointer user_data);
static void nact_editor_fill_profiles_list (GtkWidget *list, NautilusActionsConfigAction* action);
enum {
ICON_STOCK_COLUMN = 0,
......@@ -73,7 +79,7 @@ strip_underscore (const gchar *text)
return result;
}
static void
void
field_changed_cb (GObject *object, gpointer user_data)
{
GtkWidget* editor = nact_get_glade_widget_from ("EditActionDialog", GLADE_EDIT_DIALOG_WIDGET);
......@@ -86,7 +92,7 @@ field_changed_cb (GObject *object, gpointer user_data)
gtk_dialog_set_response_sensitive (GTK_DIALOG (editor), GTK_RESPONSE_OK, FALSE);
}
/*void
void
icon_browse_button_clicked_cb (GtkButton *button, gpointer user_data)
{
gchar* last_dir;
......@@ -122,7 +128,7 @@ icon_browse_button_clicked_cb (GtkButton *button, gpointer user_data)
case GTK_RESPONSE_DELETE_EVENT:
gtk_widget_hide (filechooser);
}
}*/
}
static gint sort_stock_ids (gconstpointer a, gconstpointer b)
{
......@@ -336,7 +342,8 @@ profile_name_edited_cb (GtkCellRendererText *cell,
gtk_tree_path_free (path);
}
void nact_editor_fill_profiles_list (GtkWidget *list, NautilusActionsConfigAction* action)
static void
nact_editor_fill_profiles_list (GtkWidget *list, NautilusActionsConfigAction* action)
{
GSList *profile_names = NULL, *l;
GtkListStore *model = GTK_LIST_STORE(gtk_tree_view_get_model (GTK_TREE_VIEW (list)));
......@@ -367,7 +374,7 @@ void nact_editor_fill_profiles_list (GtkWidget *list, NautilusActionsConfigActio
g_slist_free (profile_names);
}
/*void
void
add_prof_button_clicked_cb (GtkButton *button, gpointer user_data)
{
GtkWidget* profile_list = nact_get_glade_widget_from ("ProfilesList", GLADE_EDIT_DIALOG_WIDGET);
......@@ -380,9 +387,9 @@ add_prof_button_clicked_cb (GtkButton *button, gpointer user_data)
nact_editor_fill_profiles_list (nact_get_glade_widget_from ("ProfilesList", GLADE_EDIT_DIALOG_WIDGET), action);
field_changed_cb (G_OBJECT (profile_list), NULL);
}
}*/
}
/*void
void
edit_prof_button_clicked_cb (GtkButton *button, gpointer user_data)
{
GtkTreeSelection *selection;
......@@ -415,15 +422,15 @@ edit_prof_button_clicked_cb (GtkButton *button, gpointer user_data)
g_free (profile_name);
}
}*/
}
/*void
void
copy_prof_button_clicked_cb (GtkButton *button, gpointer user_data)
{
GtkTreeSelection *selection;
GtkTreeIter iter;
GtkTreeModel* model;
GError* error = NULL;
/*GError* error = NULL;*/
gchar* tmp;
GtkWidget *nact_prof_paste_button;
GtkWidget *nact_profiles_list = nact_get_glade_widget_from ("ProfilesList", GLADE_EDIT_DIALOG_WIDGET);
......@@ -447,7 +454,7 @@ copy_prof_button_clicked_cb (GtkButton *button, gpointer user_data)
if (action && new_action_profile)
{
// Remove and free any existing data
/* Remove and free any existing data */
nautilus_actions_config_action_profile_free (g_object_steal_data (G_OBJECT (nact_prof_paste_button), "profile"));
g_object_set_data (G_OBJECT (nact_prof_paste_button), "profile", new_action_profile);
......@@ -456,7 +463,7 @@ copy_prof_button_clicked_cb (GtkButton *button, gpointer user_data)
}
else
{
// i18n notes: will be displayed in a dialog
/* i18n notes: will be displayed in a dialog */
tmp = g_strdup_printf (_("Can't copy action's profile '%s'!"), profile_name);
nautilus_actions_display_error (tmp, "");
g_free (tmp);
......@@ -464,14 +471,14 @@ copy_prof_button_clicked_cb (GtkButton *button, gpointer user_data)
g_free (profile_name);
}
}*/
}
/*void
void
paste_prof_button_clicked_cb (GtkButton *button, gpointer user_data)
{
GtkTreeSelection *selection;
GtkTreeIter iter;
GtkTreeModel* model;
/*GtkTreeSelection *selection;*/
/*GtkTreeIter iter;*/
/*GtkTreeModel* model;*/
GError* error = NULL;
gchar* tmp;
gchar* new_profile_name;
......@@ -480,15 +487,15 @@ paste_prof_button_clicked_cb (GtkButton *button, gpointer user_data)
GtkWidget *nact_prof_paste_button = nact_get_glade_widget_from ("PasteProfileButton", GLADE_EDIT_DIALOG_WIDGET);
NautilusActionsConfigActionProfile* action_profile = (NautilusActionsConfigActionProfile*)g_object_get_data (G_OBJECT (nact_prof_paste_button), "profile");
/ * i18n notes: will be displayed in a dialog * /
/* i18n notes: will be displayed in a dialog */
const gchar *cantpaste = _( "Can't paste action's profile '%s'!" );
printf ("profile_name : %s\n", action_profile->desc_name);
// i18n notes: this is the default name of a copied profile
/* i18n notes: this is the default name of a copied profile */
gchar* new_profile_desc_name = g_strdup_printf (_("%s Copy"), action_profile->desc_name);
// Get a new uniq profile key name but not a new desc name because we already have it.
/* Get a new uniq profile key name but not a new desc name because we already have it. */
nautilus_actions_config_action_get_new_default_profile_name (action, &new_profile_name, NULL);
NautilusActionsConfigActionProfile* new_action_profile = nautilus_actions_config_action_profile_dup (action_profile);
......@@ -515,9 +522,9 @@ paste_prof_button_clicked_cb (GtkButton *button, gpointer user_data)
nautilus_actions_display_error (tmp, "");
g_free (tmp);
}
}*/
}
/*void
void
delete_prof_button_clicked_cb (GtkButton *button, gpointer user_data)
{
GtkTreeSelection *selection;
......@@ -544,7 +551,7 @@ delete_prof_button_clicked_cb (GtkButton *button, gpointer user_data)
}
else
{
// i18n notes: will be displayed in a dialog
/* i18n notes: will be displayed in a dialog */
tmp = g_strdup_printf (_("Can't delete action's profile '%s'!"), profile_name);
nautilus_actions_display_error (tmp, "");
g_free (tmp);
......@@ -552,7 +559,7 @@ delete_prof_button_clicked_cb (GtkButton *button, gpointer user_data)
g_free (profile_name);
}
}*/
}
static void
profile_list_selection_changed_cb (GtkTreeSelection *selection, gpointer user_data)
......
......@@ -24,16 +24,13 @@
* Frederic Ruaudel <grumz@grumz.net>
* Rodrigo Moya <rodrigo@gnome-db.org>
* Pierre Wieser <pwieser@trychlos.org>
* and many others (see AUTHORS)
*
* pwi 2009-05-17 make the source ansi-compliant
* ... and many others (see AUTHORS)
*/
#ifndef __NACT_EDITOR_H__
#define __NACT_EDITOR_H__
#include <libnautilus-actions/nautilus-actions-config.h>
#include <libnautilus-actions/nautilus-actions-config-gconf-writer.h>
enum {
PROFILE_LABEL_COLUMN = 0,
......@@ -41,8 +38,7 @@ enum {
N_PROF_COLUMN
};
gboolean nact_editor_new_action (void);
gboolean nact_editor_edit_action (NautilusActionsConfigAction *action);
void nact_editor_fill_profiles_list (GtkWidget *list, NautilusActionsConfigAction* action);
gboolean nact_editor_new_action(void );
gboolean nact_editor_edit_action( NautilusActionsConfigAction* action );
#endif /* __NACT_EDITOR_H__ */
......@@ -24,10 +24,7 @@
* Frederic Ruaudel <grumz@grumz.net>
* Rodrigo Moya <rodrigo@gnome-db.org>
* Pierre Wieser <pwieser@trychlos.org>
* and many others (see AUTHORS)
*
* pwi 2009-05-16 fix compilation warnings
* pwi 2009-05-17 make the source ansi-compliant
* ... and many others (see AUTHORS)
*/
#include <config.h>
......@@ -45,11 +42,16 @@
#include "nact-prefs.h"
#include "nact.h"
/* gui callback functions */
void import_browse_button_clicked_cb (GtkWidget* widget, gpointer data);
void export_browse_button_clicked_cb (GtkWidget* widget, gpointer data);
void mode_toggled_cb (GtkWidget* widget, gpointer user_data);
static gboolean nact_import_actions (void);
static gboolean nact_export_actions (void);
/*
void mode_toggled_cb (GtkWidget* widget, gpointer user_data)
void
mode_toggled_cb (GtkWidget* widget, gpointer user_data)
{
GtkWidget* import_radio = nact_get_glade_widget_from ("ImportRadioButton", GLADE_IM_EX_PORT_DIALOG_WIDGET);
......@@ -64,10 +66,9 @@ void mode_toggled_cb (GtkWidget* widget, gpointer user_data)
gtk_widget_set_sensitive (nact_get_glade_widget_from ("ImportVBox", GLADE_IM_EX_PORT_DIALOG_WIDGET), FALSE);
}
}
*/
/*
void import_browse_button_clicked_cb (GtkWidget* widget, gpointer data)
void
import_browse_button_clicked_cb (GtkWidget* widget, gpointer data)
{
gchar* last_dir;
gchar* filename;
......@@ -103,10 +104,9 @@ void import_browse_button_clicked_cb (GtkWidget* widget, gpointer data)
gtk_widget_hide (filechooser);
}
}
*/
/*
void export_browse_button_clicked_cb (GtkWidget* widget, gpointer data)
void
export_browse_button_clicked_cb (GtkWidget* widget, gpointer data)
{
gchar* last_dir;
gchar* foldername;
......@@ -142,7 +142,6 @@ void export_browse_button_clicked_cb (GtkWidget* widget, gpointer data)
gtk_widget_hide (folderchooser);
}
}
*/
static void
list_selection_changed_cb (GtkTreeSelection *selection, gpointer user_data)
......
......@@ -24,9 +24,7 @@
* Frederic Ruaudel <grumz@grumz.net>
* Rodrigo Moya <rodrigo@gnome-db.org>
* Pierre Wieser <pwieser@trychlos.org>
* and many others (see AUTHORS)
*
* pwi 2009-05-17 make the source ansi-compliant
* ... and many others (see AUTHORS)
*/
#ifndef __NACT_IMPORT_EXPORT_H__
......
......@@ -24,9 +24,7 @@
* Frederic Ruaudel <grumz@grumz.net>
* Rodrigo Moya <rodrigo@gnome-db.org>
* Pierre Wieser <pwieser@trychlos.org>
* and many others (see AUTHORS)
*
* pwi 2009-05-17 make the source ansi-compliant
* ... and many others (see AUTHORS)
*/
#include <config.h>
......
......@@ -24,9 +24,7 @@
* Frederic Ruaudel <grumz@grumz.net>
* Rodrigo Moya <rodrigo@gnome-db.org>
* Pierre Wieser <pwieser@trychlos.org>
* and many others (see AUTHORS)
*
* pwi 2009-05-17 make the source ansi-compliant
* ... and many others (see AUTHORS)
*/
#ifndef __NACT_PREFS_H__
......
......@@ -24,10 +24,7 @@
* Frederic Ruaudel <grumz@grumz.net>
* Rodrigo Moya <rodrigo@gnome-db.org>
* Pierre Wieser <pwieser@trychlos.org>
* and many others (see AUTHORS)
*
* pwi 2009-05-16 fix compilation warnings
* pwi 2009-05-17 make the source ansi-compliant
* ... and many others (see AUTHORS)
*/
#include <string.h>
......@@ -42,8 +39,16 @@
#include "nact-prefs.h"
#include "nact.h"
/* gui callback functions */
void profile_field_changed_cb (GObject *object, gpointer user_data);
void path_browse_button_clicked_cb (GtkButton *button, gpointer user_data);
void legend_button_toggled_cb (GtkToggleButton *button, gpointer user_data);
void add_scheme_clicked (GtkWidget* widget, gpointer user_data);
void remove_scheme_clicked (GtkWidget* widget, gpointer user_data);
static void update_example_label (void);
static void profile_field_changed_cb (GObject *object, gpointer user_data);
static void show_legend_dialog( void );
static void hide_legend_dialog( void );
static void
update_example_label (void)
......@@ -67,7 +72,7 @@ update_example_label (void)
g_free (tmp);
}
static void
void
profile_field_changed_cb (GObject *object, gpointer user_data)
{
GtkWidget* editor = nact_get_glade_widget_from ("EditProfileDialog", GLADE_EDIT_PROFILE_DIALOG_WIDGET);
......@@ -87,7 +92,8 @@ example_changed_cb (GObject *object, gpointer user_data)
{
}*/
/*void path_browse_button_clicked_cb (GtkButton *button, gpointer user_data)
void
path_browse_button_clicked_cb (GtkButton *button, gpointer user_data)
{
gchar* last_dir;
gchar* filename;
......@@ -122,18 +128,18 @@ example_changed_cb (GObject *object, gpointer user_data)
case GTK_RESPONSE_DELETE_EVENT:
gtk_widget_hide (filechooser);
}
}*/
}
/*static void
static void
show_legend_dialog ()
{
GtkWidget* editor = nact_get_glade_widget_from ("EditActionDialog", GLADE_EDIT_PROFILE_DIALOG_WIDGET);
GtkWidget *legend_dialog = nact_get_glade_widget_from ("LegendDialog", GLADE_LEGEND_DIALOG_WIDGET);
gtk_window_set_deletable (GTK_WINDOW (legend_dialog), FALSE);
gtk_window_set_transient_for (GTK_WINDOW (legend_dialog), GTK_WINDOW (editor));
// TODO: Get back the last position saved !!
/* TODO: Get back the last position saved !! */
gtk_widget_show (legend_dialog);
}*/
}
static void
hide_legend_dialog ()
......@@ -149,7 +155,7 @@ hide_legend_dialog ()
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (legend_button), FALSE);
}
/*void
void
legend_button_toggled_cb (GtkToggleButton *button, gpointer user_data)
{
if (gtk_toggle_button_get_active (button))
......@@ -160,7 +166,7 @@ legend_button_toggled_cb (GtkToggleButton *button, gpointer user_data)
{
hide_legend_dialog ();
}
}*/
}
static void scheme_selection_toggled_cb (GtkCellRendererToggle *cell_renderer,
gchar *path_str,
......@@ -246,7 +252,8 @@ scheme_list_selection_changed_cb (GtkTreeSelection *selection, gpointer user_dat
}
}
/*void add_scheme_clicked (GtkWidget* widget, gpointer user_data)
void
add_scheme_clicked (GtkWidget* widget, gpointer user_data)
{
GtkWidget* listview = nact_get_glade_widget_from ("SchemesTreeView", GLADE_EDIT_PROFILE_DIALOG_WIDGET);
GtkTreeModel* model = gtk_tree_view_get_model (GTK_TREE_VIEW (listview));
......@@ -254,12 +261,13 @@ scheme_list_selection_changed_cb (GtkTreeSelection *selection, gpointer user_dat
gtk_list_store_append (GTK_LIST_STORE (model), &row);