diff options
Diffstat (limited to 'control-center')
-rw-r--r-- | control-center/ChangeLog | 10 | ||||
-rw-r--r-- | control-center/control-center-categories.c | 1 | ||||
-rw-r--r-- | control-center/control-center.c | 4 | ||||
-rw-r--r-- | control-center/gnomecc-canvas.c | 18 | ||||
-rw-r--r-- | control-center/gnomecc-rounded-rect.c | 2 |
5 files changed, 12 insertions, 23 deletions
diff --git a/control-center/ChangeLog b/control-center/ChangeLog index eab8eda4a..fe52dd0e3 100644 --- a/control-center/ChangeLog +++ b/control-center/ChangeLog @@ -1,3 +1,13 @@ +2005-11-14 Kjartan Maraas <kmaraas@gnome.org> + + * control-center-categories.c: (populate_category): + * control-center.c: (main): + * gnomecc-canvas.c: (setup_entry), (cb_canvas_event), + (gnomecc_canvas_item_accessible_class_init), + (gnomecc_canvas_accessible_class_init), + (gnomecc_canvas_accessible_add_selection): + * gnomecc-rounded-rect.c: Remove some unused code. + 2005-10-25 Carlos Garnacho Parro <carlosg@gnome.org> * control-center-categories.[ch] (control_center_reload_icons): added diff --git a/control-center/control-center-categories.c b/control-center/control-center-categories.c index 1bacb2703..ee0a2e11c 100644 --- a/control-center/control-center-categories.c +++ b/control-center/control-center-categories.c @@ -179,7 +179,6 @@ populate_category (ControlCenterCategory *category, g_slist_free (items); if (entries != NULL) { - GSList *l; int i; category->n_entries = g_slist_length (entries); diff --git a/control-center/control-center.c b/control-center/control-center.c index 3e07a3a75..d7c278160 100644 --- a/control-center/control-center.c +++ b/control-center/control-center.c @@ -71,13 +71,11 @@ create_window (void) int main (int argc, char *argv[]) { - GnomeProgram *ccprogram; - bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); textdomain (GETTEXT_PACKAGE); - ccprogram = gnome_program_init ("gnome-control-center", + gnome_program_init ("gnome-control-center", VERSION, LIBGNOMEUI_MODULE, argc, argv, GNOME_PARAM_APP_DATADIR, GNOMECC_DATA_DIR, diff --git a/control-center/gnomecc-canvas.c b/control-center/gnomecc-canvas.c index cbde2e18b..f83f1fe51 100644 --- a/control-center/gnomecc-canvas.c +++ b/control-center/gnomecc-canvas.c @@ -223,7 +223,6 @@ gnome_canvas_item_show_hide (GnomeCanvasItem *item, gboolean show) static void setup_entry (GnomeccCanvas *canvas, ControlCenterEntry *entry) { - GnomeccCanvasPrivate *priv; EntryInfo *ei; GtkWidget *widget; GtkStateType state; @@ -231,7 +230,6 @@ setup_entry (GnomeccCanvas *canvas, ControlCenterEntry *entry) if (!entry) return; - priv = GNOMECC_CANVAS_GET_PRIVATE (canvas); widget = GTK_WIDGET (canvas); ei = entry->user_data; @@ -360,7 +358,6 @@ cb_canvas_event (GnomeCanvasItem *item, GdkEvent *event, GnomeccCanvas *canvas) GnomeccCanvasPrivate *priv; EntryInfo *ei = NULL; gint n_category, n_entry; - gint n_categories, n_entries; priv = GNOMECC_CANVAS_GET_PRIVATE (canvas); @@ -377,8 +374,6 @@ cb_canvas_event (GnomeCanvasItem *item, GdkEvent *event, GnomeccCanvas *canvas) n_entry = 0; n_category = 0; - n_categories = priv->info->n_categories; - n_entries = priv->info->categories[ei->n_category]->n_entries; switch (event->key.keyval) { case GDK_KP_Right: @@ -441,7 +436,6 @@ cb_canvas_event (GnomeCanvasItem *item, GdkEvent *event, GnomeccCanvas *canvas) activate_entry (priv->selected); return TRUE; - break; case GDK_Escape: gtk_main_quit (); return TRUE; @@ -1237,12 +1231,8 @@ gnomecc_canvas_item_accessible_ref_state_set (AtkObject *object) static void gnomecc_canvas_item_accessible_class_init (AtkObjectClass *class) { - GObjectClass *object_class; - accessible_item_parent_class = g_type_class_peek_parent (class); - object_class = (GObjectClass *)class; - class->get_index_in_parent = gnomecc_canvas_item_accessible_get_index_in_parent; class->get_name = gnomecc_canvas_item_accessible_get_name; class->get_parent = gnomecc_canvas_item_accessible_get_parent; @@ -1399,14 +1389,8 @@ gnomecc_canvas_accessible_initialize (AtkObject *accessible, gpointer data) static void gnomecc_canvas_accessible_class_init (AtkObjectClass *class) { - GObjectClass *object_class; - GtkAccessibleClass *accessible_class; - accessible_parent_class = g_type_class_peek_parent (class); - object_class = (GObjectClass *)class; - accessible_class = (GtkAccessibleClass *)class; - class->get_n_children = gnomecc_canvas_accessible_get_n_children; class->ref_child = gnomecc_canvas_accessible_ref_child; class->initialize = gnomecc_canvas_accessible_initialize; @@ -1415,7 +1399,6 @@ gnomecc_canvas_accessible_class_init (AtkObjectClass *class) static gboolean gnomecc_canvas_accessible_add_selection (AtkSelection *selection, gint i) { - GnomeccCanvasPrivate *priv; GnomeccCanvas *canvas; GtkWidget *widget; ControlCenterEntry *entry; @@ -1426,7 +1409,6 @@ gnomecc_canvas_accessible_add_selection (AtkSelection *selection, gint i) return FALSE; canvas = GNOMECC_CANVAS (widget); - priv = GNOMECC_CANVAS_GET_PRIVATE (canvas); entry = gnomecc_canvas_accessible_get_entry (canvas, i); select_entry (canvas, entry); diff --git a/control-center/gnomecc-rounded-rect.c b/control-center/gnomecc-rounded-rect.c index a9db3a0c4..0cbd06dbc 100644 --- a/control-center/gnomecc-rounded-rect.c +++ b/control-center/gnomecc-rounded-rect.c @@ -33,7 +33,7 @@ typedef GnomeCanvasRectClass GnomeccRoundedRectClass; #define GNOMECC_ROUNDED_RECT_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GNOMECC_TYPE_ROUNDED_RECT, GnomeccRoundedRectClass)) #define GNOMECC_IS_ROUNDED_RECT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GNOMECC_TYPE_ROUNDED_RECT)) -G_DEFINE_TYPE (GnomeccRoundedRect, gnomecc_rounded_rect, GNOME_TYPE_CANVAS_RECT); +G_DEFINE_TYPE (GnomeccRoundedRect, gnomecc_rounded_rect, GNOME_TYPE_CANVAS_RECT) /************************************************************************* * Adapted from nautilus/libnautilus-private/nautilus-icon-canvas-item.c |