summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog20
-rw-r--r--gladeui/glade-base-editor.c7
-rw-r--r--gladeui/glade-catalog.c4
-rw-r--r--gladeui/glade-design-layout.c8
-rw-r--r--gladeui/glade-editor-property.c2
-rw-r--r--gladeui/glade-inspector.c3
-rw-r--r--gladeui/glade-named-icon-chooser-dialog.c11
-rw-r--r--gladeui/glade-palette.c5
-rw-r--r--gladeui/glade-placeholder.c5
-rw-r--r--gladeui/glade-project.c2
-rw-r--r--gladeui/glade-property.c3
-rw-r--r--gladeui/glade-widget.c15
-rw-r--r--plugins/gtk+/glade-accels.c4
-rw-r--r--plugins/gtk+/glade-attributes.c2
-rw-r--r--plugins/gtk+/glade-gtk.c19
-rw-r--r--plugins/gtk+/glade-model-data.c11
-rw-r--r--src/glade-window.c3
17 files changed, 37 insertions, 87 deletions
diff --git a/ChangeLog b/ChangeLog
index 1f79a83a..59806ea4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2011-05-20 Juan Pablo Ugarte <juanpablougarte@gmail.com>
+
+ * gladeui/glade-base-editor.c,
+ gladeui/glade-catalog.c
+ gladeui/glade-design-layout.c
+ gladeui/glade-editor-property.c
+ gladeui/glade-inspector.c
+ gladeui/glade-named-icon-chooser-dialog.c
+ gladeui/glade-palette.c
+ gladeui/glade-placeholder.c
+ gladeui/glade-project.c
+ gladeui/glade-property.c
+ gladeui/glade-widget.c
+ plugins/gtk+/glade-accels.c
+ plugins/gtk+/glade-attributes.c
+ plugins/gtk+/glade-gtk.c
+ plugins/gtk+/glade-model-data.c
+ src/glade-window.c:
+ Fixed "variable set but not used" warnings (-Wunused-but-set-variable)
+
2011-04-29 Javier Jardón <jjardon@gnome.org>
* gladeui/glade-utils.c: Correctly detect the required devhelp version
diff --git a/gladeui/glade-base-editor.c b/gladeui/glade-base-editor.c
index 578cbd09..d94e7c25 100644
--- a/gladeui/glade-base-editor.c
+++ b/gladeui/glade-base-editor.c
@@ -512,7 +512,7 @@ static void
glade_base_editor_child_change_type (GladeBaseEditor * editor,
GtkTreeIter * iter, GType type)
{
- GladeWidget *gchild, *gparent;
+ GladeWidget *gchild;
GObject *child;
gchar *class_name;
gboolean retval;
@@ -534,8 +534,6 @@ glade_base_editor_child_change_type (GladeBaseEditor * editor,
return;
}
- gparent = glade_widget_get_parent (gchild);
-
/* Start of glade-command */
if (glade_base_editor_get_type_info (editor, NULL,
@@ -1329,7 +1327,7 @@ glade_base_editor_change_type (GladeBaseEditor * editor,
{
GladeWidget *parent, *gchild_new;
GList *children, *l;
- GObject *child, *child_new;
+ GObject *child_new;
GtkTreeIter iter;
gchar *name, *class_name;
@@ -1340,7 +1338,6 @@ glade_base_editor_change_type (GladeBaseEditor * editor,
&class_name, -1) == FALSE)
return TRUE;
- child = glade_widget_get_object (gchild);
name = g_strdup (glade_widget_get_name (gchild));
glade_base_editor_find_child (editor, gchild, &iter);
diff --git a/gladeui/glade-catalog.c b/gladeui/glade-catalog.c
index 068cb21f..5489245e 100644
--- a/gladeui/glade-catalog.c
+++ b/gladeui/glade-catalog.c
@@ -341,15 +341,13 @@ catalog_load_classes (GladeCatalog * catalog, GladeXmlNode * widgets_node)
node = glade_xml_node_get_children (widgets_node);
for (; node; node = glade_xml_node_next (node))
{
- const gchar *node_name, *domain;
+ const gchar *node_name;
GladeWidgetAdaptor *adaptor;
node_name = glade_xml_node_get_name (node);
if (strcmp (node_name, GLADE_TAG_GLADE_WIDGET_CLASS) != 0)
continue;
- domain = catalog->domain ? catalog->domain : catalog->library;
-
adaptor = glade_widget_adaptor_from_catalog (catalog, node, module);
catalog->adaptors = g_list_prepend (catalog->adaptors, adaptor);
diff --git a/gladeui/glade-design-layout.c b/gladeui/glade-design-layout.c
index 58e4bf16..23059633 100644
--- a/gladeui/glade-design-layout.c
+++ b/gladeui/glade-design-layout.c
@@ -124,11 +124,8 @@ glade_design_layout_update_child (GladeDesignLayout *layout,
GtkWidget *child,
GtkAllocation *allocation)
{
- GladeDesignLayoutPrivate *priv;
GladeWidget *gchild;
- priv = GLADE_DESIGN_LAYOUT_GET_PRIVATE (layout);
-
/* Update GladeWidget metadata */
gchild = glade_widget_get_from_gobject (child);
g_object_set (gchild,
@@ -143,7 +140,6 @@ glade_design_layout_motion_notify_event (GtkWidget *widget, GdkEventMotion *ev)
{
GtkWidget *child;
GladeDesignLayoutPrivate *priv;
- GladeWidget *child_glade_widget;
GtkAllocation allocation;
gint x, y, new_width, new_height;
@@ -155,7 +151,6 @@ glade_design_layout_motion_notify_event (GtkWidget *widget, GdkEventMotion *ev)
x = ev->x;
y = ev->y;
- child_glade_widget = glade_widget_get_from_gobject (child);
gtk_widget_get_allocation (child, &allocation);
allocation.x += priv->child_offset;
@@ -357,14 +352,11 @@ static void
glade_design_layout_get_preferred_width (GtkWidget *widget,
gint *minimum, gint *natural)
{
- GladeDesignLayoutPrivate *priv;
GtkWidget *child;
GladeWidget *gchild;
gint child_width = 0;
guint border_width = 0;
- priv = GLADE_DESIGN_LAYOUT_GET_PRIVATE (widget);
-
*minimum = 0;
child = gtk_bin_get_child (GTK_BIN (widget));
diff --git a/gladeui/glade-editor-property.c b/gladeui/glade-editor-property.c
index b4d75e2b..81897c0c 100644
--- a/gladeui/glade-editor-property.c
+++ b/gladeui/glade-editor-property.c
@@ -849,7 +849,6 @@ glade_eprop_enum_changed (GtkWidget * combo_box, GladeEditorProperty * eprop)
gint ival;
GValue val = { 0, };
GParamSpec *pspec;
- GladeProperty *property;
GtkTreeModel *tree_model;
GtkTreeIter iter;
@@ -860,7 +859,6 @@ glade_eprop_enum_changed (GtkWidget * combo_box, GladeEditorProperty * eprop)
gtk_combo_box_get_active_iter (GTK_COMBO_BOX (combo_box), &iter);
gtk_tree_model_get (tree_model, &iter, 1, &ival, -1);
- property = eprop->priv->property;
pspec = glade_property_class_get_pspec (eprop->priv->klass);
g_value_init (&val, pspec->value_type);
diff --git a/gladeui/glade-inspector.c b/gladeui/glade-inspector.c
index 922c1c1b..94b6cf94 100644
--- a/gladeui/glade-inspector.c
+++ b/gladeui/glade-inspector.c
@@ -266,12 +266,11 @@ search_complete_idle (GladeInspector * inspector)
GladeInspectorPrivate *priv = inspector->priv;
const gchar *str;
gchar *completed = NULL;
- GList *list;
gsize length;
str = gtk_entry_get_text (GTK_ENTRY (priv->entry));
- list = g_completion_complete (priv->completion, str, &completed);
+ g_completion_complete (priv->completion, str, &completed);
if (completed)
{
length = strlen (str);
diff --git a/gladeui/glade-named-icon-chooser-dialog.c b/gladeui/glade-named-icon-chooser-dialog.c
index f0e4819c..0f0c0d9a 100644
--- a/gladeui/glade-named-icon-chooser-dialog.c
+++ b/gladeui/glade-named-icon-chooser-dialog.c
@@ -1262,10 +1262,6 @@ glade_named_icon_chooser_dialog_draw (GtkWidget * widget, cairo_t * cr)
static void
response_cb (GtkDialog * dialog, gint response_id)
{
- GladeNamedIconChooserDialogPrivate *priv;
-
- priv = GLADE_NAMED_ICON_CHOOSER_DIALOG_GET_PRIVATE (dialog);
-
/* Act only on response IDs we recognize */
if (!(response_id == GTK_RESPONSE_ACCEPT
|| response_id == GTK_RESPONSE_OK
@@ -1663,15 +1659,14 @@ static GKeyFile *
settings_to_keyfile (GladeNamedIconChooserDialog * dialog)
{
GKeyFile *keyfile;
- gboolean retval;
gchar *filename;
keyfile = g_key_file_new ();
filename = get_config_filename ();
- retval = g_key_file_load_from_file (keyfile,
- get_config_filename (),
- G_KEY_FILE_NONE, NULL);
+ g_key_file_load_from_file (keyfile,
+ get_config_filename (),
+ G_KEY_FILE_NONE, NULL);
g_free (filename);
g_key_file_set_boolean (keyfile,
diff --git a/gladeui/glade-palette.c b/gladeui/glade-palette.c
index 2c13f017..cf748c9a 100644
--- a/gladeui/glade-palette.c
+++ b/gladeui/glade-palette.c
@@ -337,12 +337,9 @@ glade_palette_new_item (GladePalette * palette, GladeWidgetAdaptor * adaptor)
static GtkWidget *
glade_palette_new_item_group (GladePalette * palette, GladeWidgetGroup * group)
{
- GladePalettePrivate *priv;
GtkWidget *item_group, *item, *label;
GList *l;
- priv = palette->priv;
-
/* Give the item group a left aligned label */
label = gtk_label_new (glade_widget_group_get_title (group));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
@@ -393,11 +390,9 @@ glade_palette_append_item_group (GladePalette * palette,
static void
glade_palette_populate (GladePalette * palette)
{
- GladePalettePrivate *priv;
GList *l;
g_return_if_fail (GLADE_IS_PALETTE (palette));
- priv = palette->priv;
for (l = (GList *) glade_app_get_catalogs (); l; l = l->next)
{
diff --git a/gladeui/glade-placeholder.c b/gladeui/glade-placeholder.c
index 8a1d2a4f..4b16cd4d 100644
--- a/gladeui/glade-placeholder.c
+++ b/gladeui/glade-placeholder.c
@@ -393,15 +393,10 @@ glade_placeholder_motion_notify_event (GtkWidget * widget,
GdkEventMotion * event)
{
GladePointerMode pointer_mode;
- GladeWidget *gparent, *gparent_parent = NULL;
GladeProject *project;
g_return_val_if_fail (GLADE_IS_PLACEHOLDER (widget), FALSE);
- gparent = glade_placeholder_get_parent (GLADE_PLACEHOLDER (widget));
- if (gparent)
- gparent_parent = glade_widget_get_parent (gparent);
-
project = glade_placeholder_get_project (GLADE_PLACEHOLDER (widget));
pointer_mode = glade_project_get_pointer_mode (project);
diff --git a/gladeui/glade-project.c b/gladeui/glade-project.c
index 19b56fa3..79605a13 100644
--- a/gladeui/glade-project.c
+++ b/gladeui/glade-project.c
@@ -1976,7 +1976,6 @@ glade_project_verify_property_internal (GladeProject *project,
gboolean forwidget)
{
GladeWidgetAdaptor *adaptor, *prop_adaptor;
- GladeWidget *widget;
GladePropertyClass *pclass;
GParamSpec *pspec;
gint target_major, target_minor;
@@ -1989,7 +1988,6 @@ glade_project_verify_property_internal (GladeProject *project,
pspec = glade_property_class_get_pspec (pclass);
prop_adaptor = glade_property_class_get_adaptor (pclass);
adaptor = glade_widget_adaptor_from_pspec (prop_adaptor, pspec);
- widget = glade_property_get_widget (property);
g_object_get (adaptor, "catalog", &catalog, NULL);
glade_project_target_version_for_adaptor (project, adaptor,
diff --git a/gladeui/glade-property.c b/gladeui/glade-property.c
index 2380697d..8bd9bc82 100644
--- a/gladeui/glade-property.c
+++ b/gladeui/glade-property.c
@@ -1163,14 +1163,11 @@ glade_property_write (GladeProperty * property,
GladeXmlContext * context, GladeXmlNode * node)
{
GladeXmlNode *prop_node;
- GladeProject *project;
gchar *name, *value, *tmp;
g_return_if_fail (GLADE_IS_PROPERTY (property));
g_return_if_fail (node != NULL);
- project = glade_widget_get_project (property->priv->widget);
-
/* This code should work the same for <packing> and <widget> */
if (!(glade_xml_node_verify_silent (node, GLADE_XML_TAG_PACKING) ||
glade_xml_node_verify_silent (node, GLADE_XML_TAG_WIDGET)))
diff --git a/gladeui/glade-widget.c b/gladeui/glade-widget.c
index 5f6d2543..b28b94c9 100644
--- a/gladeui/glade-widget.c
+++ b/gladeui/glade-widget.c
@@ -825,7 +825,7 @@ glade_widget_constructor (GType type,
GObjectConstructParam * construct_properties)
{
GladeWidget *gwidget;
- GObject *ret_obj, *object;
+ GObject *ret_obj;
GList *properties = NULL, *list;
ret_obj = G_OBJECT_CLASS (glade_widget_parent_class)->constructor
@@ -871,11 +871,9 @@ glade_widget_constructor (GType type,
}
if (gwidget->priv->object == NULL)
- {
- object = glade_widget_build_object (gwidget,
- gwidget->priv->construct_template,
- gwidget->priv->construct_reason);
- }
+ glade_widget_build_object (gwidget,
+ gwidget->priv->construct_template,
+ gwidget->priv->construct_reason);
/* Copy sync parentless widget props here after a dup
*/
@@ -3299,7 +3297,6 @@ static void
glade_widget_set_object (GladeWidget * gwidget, GObject * new_object,
gboolean destroy)
{
- GladeWidgetAdaptor *adaptor;
GObject *old_object;
g_return_if_fail (GLADE_IS_WIDGET (gwidget));
@@ -3310,7 +3307,6 @@ glade_widget_set_object (GladeWidget * gwidget, GObject * new_object,
if (gwidget->priv->object == new_object)
return;
- adaptor = gwidget->priv->adaptor;
old_object = gwidget->priv->object;
gwidget->priv->object = new_object;
@@ -3659,15 +3655,12 @@ glade_widget_write_special_child_prop (GladeWidget * parent,
GladeXmlContext * context,
GladeXmlNode * node)
{
- GladeXmlNode *packing_node;
gchar *buff, *special_child_type;
buff = g_object_get_data (object, "special-child-type");
g_object_get (parent->priv->adaptor, "special-child-type", &special_child_type,
NULL);
- packing_node = glade_xml_search_child (node, GLADE_XML_TAG_PACKING);
-
if (special_child_type && buff)
{
glade_xml_node_set_property_string (node, GLADE_XML_TAG_TYPE, buff);
diff --git a/plugins/gtk+/glade-accels.c b/plugins/gtk+/glade-accels.c
index cd2c69f3..18349723 100644
--- a/plugins/gtk+/glade-accels.c
+++ b/plugins/gtk+/glade-accels.c
@@ -506,14 +506,10 @@ glade_eprop_accel_show_dialog (GtkWidget * dialog_button,
{
GladeEPropAccel *eprop_accel = GLADE_EPROP_ACCEL (eprop);
GtkWidget *dialog, *parent, *vbox, *sw, *tree_view;
- GladeProject *project;
- GladeProperty *property;
GValue value = { 0, };
GList *accelerators = NULL;
gint res;
- property = glade_editor_property_get_property (eprop);
- project = glade_widget_get_project (glade_property_get_widget (property));
parent = gtk_widget_get_toplevel (GTK_WIDGET (eprop));
dialog = gtk_dialog_new_with_buttons (_("Choose accelerator keys..."),
diff --git a/plugins/gtk+/glade-attributes.c b/plugins/gtk+/glade-attributes.c
index ff7d638d..5fb0d9b3 100644
--- a/plugins/gtk+/glade-attributes.c
+++ b/plugins/gtk+/glade-attributes.c
@@ -1023,13 +1023,11 @@ glade_eprop_attrs_show_dialog (GtkWidget * dialog_button,
{
GladeEPropAttrs *eprop_attrs = GLADE_EPROP_ATTRS (eprop);
GtkWidget *dialog, *parent, *vbox, *sw, *tree_view;
- GladeProject *project;
GladeProperty *property;
GList *old_attributes;
gint res;
property = glade_editor_property_get_property (eprop);
- project = glade_widget_get_project (glade_property_get_widget (property));
parent = gtk_widget_get_toplevel (GTK_WIDGET (eprop));
diff --git a/plugins/gtk+/glade-gtk.c b/plugins/gtk+/glade-gtk.c
index dbb6d70f..799f37ee 100644
--- a/plugins/gtk+/glade-gtk.c
+++ b/plugins/gtk+/glade-gtk.c
@@ -1821,7 +1821,6 @@ glade_gtk_box_add_child (GladeWidgetAdaptor * adaptor,
GObject * object, GObject * child)
{
GladeWidget *gbox, *gchild;
- GladeProject *project;
GList *children;
gint num_children;
@@ -1829,7 +1828,6 @@ glade_gtk_box_add_child (GladeWidgetAdaptor * adaptor,
g_return_if_fail (GTK_IS_WIDGET (child));
gbox = glade_widget_get_from_gobject (object);
- project = glade_widget_get_project (gbox);
/*
Try to remove the last placeholder if any, this way GtkBox`s size
@@ -2431,7 +2429,6 @@ static void
glade_gtk_notebook_selection_changed (GladeProject * project,
GladeWidget * gwidget)
{
- GladeWidget *selected;
GList *list;
gint i;
GtkWidget *page, *sel_widget;
@@ -2440,7 +2437,6 @@ glade_gtk_notebook_selection_changed (GladeProject * project,
if ((list = glade_project_selection_get (project)) != NULL &&
g_list_length (list) == 1)
{
- selected = glade_widget_get_from_gobject (list->data);
sel_widget = list->data;
/* Check if selected widget is inside the notebook */
@@ -2559,7 +2555,7 @@ glade_gtk_notebook_set_n_pages (GObject * object, const GValue * value)
{
GladeWidget *widget;
GtkNotebook *notebook;
- GtkWidget *child_widget, *tab_widget;
+ GtkWidget *child_widget;
gint new_size, i;
gint old_size;
@@ -2619,7 +2615,6 @@ glade_gtk_notebook_set_n_pages (GObject * object, const GValue * value)
/* Get the last page and remove it (project objects have been cleared by
* the action code already). */
child_widget = gtk_notebook_get_nth_page (notebook, old_size - 1);
- tab_widget = gtk_notebook_get_tab_label (notebook, child_widget);
/* Ok there shouldnt be widget in the content area, that's
* the placeholder, we should clean up the project widget that
@@ -7490,10 +7485,6 @@ void
glade_gtk_text_view_post_create (GladeWidgetAdaptor * adaptor,
GObject * object, GladeCreateReason reason)
{
- GladeWidget *gtext;
-
- gtext = glade_widget_get_from_gobject (object);
-
/* This makes gtk_text_view_set_buffer() stop complaing */
gtk_drag_dest_set (GTK_WIDGET (object), 0, NULL, 0, 0);
@@ -8076,7 +8067,7 @@ glade_gtk_assistant_set_child_property (GladeWidgetAdaptor * adaptor,
{
GtkAssistant *assistant = GTK_ASSISTANT (container);
GtkWidget *widget = GTK_WIDGET (child);
- gint pos, size;
+ gint pos;
gboolean set_current;
if ((pos = g_value_get_int (value)) < 0)
@@ -8084,9 +8075,7 @@ glade_gtk_assistant_set_child_property (GladeWidgetAdaptor * adaptor,
if (pos == glade_gtk_assistant_get_page (assistant, widget))
return;
set_current = gtk_assistant_get_current_page (assistant) ==
- glade_gtk_assistant_get_page (assistant, widget);
-
- size = gtk_assistant_get_n_pages (assistant);
+ glade_gtk_assistant_get_page (assistant, widget);
g_object_ref (child);
gtk_container_remove (GTK_CONTAINER (container), widget);
@@ -8814,11 +8803,9 @@ glade_gtk_cell_renderer_sync_attributes (GObject * object)
if (strncmp (glade_property_class_id (pclass), "attr-", attr_len) == 0)
{
- GladeProperty *attr_prop;
gint column = g_value_get_int (glade_property_inline_value (property));
attr_prop_name = (gchar *)&glade_property_class_id (pclass)[attr_len];
- attr_prop = glade_widget_get_property (widget, attr_prop_name);
if (column >= 0 && column < columns)
{
diff --git a/plugins/gtk+/glade-model-data.c b/plugins/gtk+/glade-model-data.c
index 496b263b..c0b420a5 100644
--- a/plugins/gtk+/glade-model-data.c
+++ b/plugins/gtk+/glade-model-data.c
@@ -528,7 +528,7 @@ static GtkListStore *
eprop_model_data_generate_store (GladeEditorProperty * eprop)
{
GtkListStore *store = NULL;
- GladeModelData *iter_data, *row_data;
+ GladeModelData *iter_data;
GNode *data_tree = NULL, *iter_node, *row_node;
GArray *gtypes = g_array_new (FALSE, TRUE, sizeof (GType));
GtkTreeIter iter;
@@ -561,8 +561,6 @@ eprop_model_data_generate_store (GladeEditorProperty * eprop)
for (row_num = 0, row_node = data_tree->children; row_node;
row_num++, row_node = row_node->next)
{
- row_data = row_node->data;
-
gtk_list_store_append (store, &iter);
gtk_list_store_set (store, &iter, COLUMN_ROW, row_num, -1);
@@ -1029,17 +1027,12 @@ eprop_data_focus_editing_cell (GladeEPropModelData * eprop_data)
GtkTreePath *item_path;
GtkTreeIter iter;
GtkTreeViewColumn *column;
- gint row, col, rows, cols;
+ gint row, col;
GList *column_list;
column_list = gtk_tree_view_get_columns (eprop_data->view);
- cols = g_list_length (column_list);
g_list_free (column_list);
- rows =
- gtk_tree_model_iter_n_children (GTK_TREE_MODEL (eprop_data->store),
- NULL);
-
col = eprop_data->editing_column;
row = eprop_data->editing_row;
diff --git a/src/glade-window.c b/src/glade-window.c
index 0d465acc..73d8fa73 100644
--- a/src/glade-window.c
+++ b/src/glade-window.c
@@ -2742,7 +2742,6 @@ static void
check_reload_project (GladeWindow * window, GladeProject * project)
{
gchar *path;
- gint ret;
GtkWidget *dialog;
GtkWidget *button;
gint response;
@@ -2818,7 +2817,7 @@ check_reload_project (GladeWindow * window, GladeProject * project)
path = g_strdup (glade_project_get_path (project));
do_close (window, project);
- ret = open_project (window, path);
+ open_project (window, path);
g_free (path);
}
View Lorry Controller Status