[cairo-commit] roadster/src downloadmanager.c, 1.4, 1.5 locationeditwindow.c, 1.5, 1.6 locationset.h, 1.10, 1.11 mainwindow.c, 1.56, 1.57 mapinfowindow.c, 1.4, 1.5 scenemanager.c, 1.17, 1.18 tooltipwindow.c, 1.3, 1.4
Jeff Garrett
commit at pdx.freedesktop.org
Sat Sep 8 02:31:55 PDT 2007
Committed by: jgarrett
Update of /cvs/cairo/roadster/src
In directory kemper:/tmp/cvs-serv19083/src
Modified Files:
downloadmanager.c locationeditwindow.c locationset.h
mainwindow.c mapinfowindow.c scenemanager.c tooltipwindow.c
Log Message:
* src/downloadmanager.c:
* src/locationeditwindow.c:
* src/locationset.h:
* src/mainwindow.c:
* src/mapinfowindow.c:
* src/scenemanager.c:
* src/tooltipwindow.c: Do not use __unused as it may be reserved
Index: downloadmanager.c
===================================================================
RCS file: /cvs/cairo/roadster/src/downloadmanager.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- downloadmanager.c 26 Oct 2005 06:53:23 -0000 1.4
+++ downloadmanager.c 8 Sep 2007 09:31:53 -0000 1.5
@@ -97,7 +97,7 @@
}
}
-// static void _downloader_gnome_vfs_close_callback(GnomeVFSAsyncHandle *_unused, GnomeVFSResult __unused, gpointer ___unused)
+// static void _downloader_gnome_vfs_close_callback(GnomeVFSAsyncHandle *_unused, GnomeVFSResult unused, gpointer ___unused)
// {
// //g_print("downloader: a file has been closed\n");
// }
Index: locationeditwindow.c
===================================================================
RCS file: /cvs/cairo/roadster/src/locationeditwindow.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- locationeditwindow.c 26 Oct 2005 06:53:23 -0000 1.5
+++ locationeditwindow.c 8 Sep 2007 09:31:53 -0000 1.6
@@ -65,7 +65,7 @@
static void locationeditwindow_set_title();
//static void locationeditwindow_nameentry_insert_text(GtkEditable *pEditable, gchar *pszNewText, gint nNewTextLen, gint *pPosition, gpointer pUserData);
static void locationeditwindow_configure_attribute_list();
-static void locationeditwindow_something_changed_callback(GtkEditable *_unused, gpointer __unused);
+static void locationeditwindow_something_changed_callback(GtkEditable *_unused, gpointer unused);
void locationeditwindow_show_for_new(gint nDefaultLocationSetID);
void locationeditwindow_show_for_edit(gint nLocationID);
@@ -277,14 +277,14 @@
// Widget Callbacks
-static void locationeditwindow_something_changed_callback(GtkEditable *_unused, gpointer __unused)
+static void locationeditwindow_something_changed_callback(GtkEditable *_unused, gpointer unused)
{
// NOTE: This callback is shared by several widgets
g_LocationEditWindow.bModified = TRUE;
locationeditwindow_set_title();
}
-void locationeditwindow_on_attributeexpander_activate(GtkExpander *_unused, gpointer __unused)
+void locationeditwindow_on_attributeexpander_activate(GtkExpander *_unused, gpointer unused)
{
// HACK: doesn't work when called directly (gets wrong value from expander?) so call it later
g_idle_add(locationeditwindow_set_expander_label, NULL);
Index: locationset.h
===================================================================
RCS file: /cvs/cairo/roadster/src/locationset.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- locationset.h 30 Sep 2005 05:09:51 -0000 1.10
+++ locationset.h 8 Sep 2007 09:31:53 -0000 1.11
@@ -32,7 +32,7 @@
// typedef struct locationsetstyle {
// // icon?
// // color?
-// int __unused;
+// int unused;
// } locationsetstyle_t;
// a set of locations (eg. "Coffee Shops")
Index: mainwindow.c
===================================================================
RCS file: /cvs/cairo/roadster/src/mainwindow.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- mainwindow.c 8 Sep 2007 09:03:35 -0000 1.56
+++ mainwindow.c 8 Sep 2007 09:31:53 -0000 1.57
@@ -503,7 +503,7 @@
mapinfowindow_update(g_MainWindow.pMap);
}
-gboolean mainwindow_locationset_list_is_separator_callback(GtkTreeModel *_unused, GtkTreeIter *pIter, gpointer __unused)
+gboolean mainwindow_locationset_list_is_separator_callback(GtkTreeModel *_unused, GtkTreeIter *pIter, gpointer unused)
{
gint nLocationSetID;
gtk_tree_model_get(GTK_TREE_MODEL(g_MainWindow.pLocationSetsListStore), pIter, LOCATIONSETLIST_COLUMN_ID, &nLocationSetID, -1);
@@ -1388,7 +1388,7 @@
return FALSE; // propagate further
}
-static gboolean mainwindow_on_window_state_change(GtkWidget *_unused, GdkEventKey *pEvent, gpointer __unused)
+static gboolean mainwindow_on_window_state_change(GtkWidget *_unused, GdkEventKey *pEvent, gpointer unused)
{
// Set the menu's check without calling the signal handler
g_signal_handlers_block_by_func(g_MainWindow.pViewFullscreenMenuItem, mainwindow_on_fullscreenmenuitem_activate, NULL);
@@ -1510,7 +1510,7 @@
return TRUE;
}
-static gboolean mainwindow_on_expose_event(GtkWidget *_unused, GdkEventExpose *pEvent, gpointer __unused)
+static gboolean mainwindow_on_expose_event(GtkWidget *_unused, GdkEventExpose *pEvent, gpointer unused)
{
if(pEvent->count > 0) return FALSE;
@@ -1531,7 +1531,7 @@
/*
** GPS Functions
*/
-void mainwindow_on_gps_show_position_toggled(GtkWidget* _unused, gpointer* __unused)
+void mainwindow_on_gps_show_position_toggled(GtkWidget* _unused, gpointer* unused)
{
gboolean bShowPosition = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(g_MainWindow.GPS.pShowPositionCheckButton));
gtk_widget_set_sensitive(GTK_WIDGET(g_MainWindow.GPS.pKeepPositionCenteredCheckButton), bShowPosition == TRUE);
@@ -1539,22 +1539,22 @@
gtk_widget_set_sensitive(GTK_WIDGET(g_MainWindow.GPS.pStickToRoadsCheckButton), FALSE); // XXX: for now.
}
-void mainwindow_on_gps_keep_position_centered_toggled(GtkWidget* _unused, gpointer* __unused)
+void mainwindow_on_gps_keep_position_centered_toggled(GtkWidget* _unused, gpointer* unused)
{
}
-void mainwindow_on_gps_show_trail_toggled(GtkWidget* _unused, gpointer* __unused)
+void mainwindow_on_gps_show_trail_toggled(GtkWidget* _unused, gpointer* unused)
{
}
-void mainwindow_on_gps_stick_to_roads_toggled(GtkWidget* _unused, gpointer* __unused)
+void mainwindow_on_gps_stick_to_roads_toggled(GtkWidget* _unused, gpointer* unused)
{
}
-static gboolean mainwindow_on_gps_redraw_timeout(gpointer __unused)
+static gboolean mainwindow_on_gps_redraw_timeout(gpointer unused)
{
// NOTE: we're setting tooltips on the image's
GtkWidget* pWidget = gtk_widget_get_parent(GTK_WIDGET(g_MainWindow.pStatusbarGPSIcon));
@@ -1766,14 +1766,14 @@
mainwindow_draw_map(DRAWFLAG_ALL);
}
-void mainwindow_on_backbutton_clicked(GtkWidget* _unused, gpointer* __unused)
+void mainwindow_on_backbutton_clicked(GtkWidget* _unused, gpointer* unused)
{
map_history_go_back(g_MainWindow.pMapHistory);
mainwindow_go_to_current_history_item();
mainwindow_update_forward_back_buttons();
}
-void mainwindow_on_forwardbutton_clicked(GtkWidget* _unused, gpointer* __unused)
+void mainwindow_on_forwardbutton_clicked(GtkWidget* _unused, gpointer* unused)
{
map_history_go_forward(g_MainWindow.pMapHistory);
mainwindow_go_to_current_history_item();
@@ -1831,7 +1831,7 @@
}
-void mainwindow_on_addpointmenuitem_activate(GtkWidget *_unused, gpointer* __unused)
+void mainwindow_on_addpointmenuitem_activate(GtkWidget *_unused, gpointer* unused)
{
mappoint_t point;
map_windowpoint_to_mappoint(g_MainWindow.pMap, &g_MainWindow.ptClickLocation, &point);
Index: mapinfowindow.c
===================================================================
RCS file: /cvs/cairo/roadster/src/mapinfowindow.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- mapinfowindow.c 26 Oct 2005 06:53:23 -0000 1.4
+++ mapinfowindow.c 8 Sep 2007 09:31:53 -0000 1.5
@@ -68,9 +68,9 @@
static void mapinfowindow_on_state_chosen(GtkMenuItem* pMenuItem, gint nStateID);
static void mapinfowindow_on_city_chosen(GtkMenuItem* pMenuItem, gint nCityID);
-static void mapinfowindow_on_state_button_clicked(GtkWidget* _unused, gpointer __unused);
-static void mapinfowindow_on_city_button_clicked(GtkWidget* _unused, gpointer __unused);
-static void mapinfowindow_on_country_button_clicked(GtkWidget* _unused, gpointer __unused);
+static void mapinfowindow_on_state_button_clicked(GtkWidget* _unused, gpointer unused);
+static void mapinfowindow_on_city_button_clicked(GtkWidget* _unused, gpointer unused);
+static void mapinfowindow_on_country_button_clicked(GtkWidget* _unused, gpointer unused);
static void mapinfowindow_load_countries();
static void mapinfowindow_load_cities(gint nStateID);
@@ -281,7 +281,7 @@
util_gtk_widget_set_visible(GTK_WIDGET(g_MapInfoWindow.pCityButton), FALSE);
}
-static void mapinfowindow_on_country_button_clicked(GtkWidget* _unused, gpointer __unused)
+static void mapinfowindow_on_country_button_clicked(GtkWidget* _unused, gpointer unused)
{
// re-zoom to the current country
mapinfowindow_select_country(g_MapInfoWindow.nCurrentCountryID, gtk_label_get_label(g_MapInfoWindow.pCountryLabel));
@@ -316,7 +316,7 @@
}
}
-static void mapinfowindow_on_state_button_clicked(GtkWidget* _unused, gpointer __unused)
+static void mapinfowindow_on_state_button_clicked(GtkWidget* _unused, gpointer unused)
{
// Just re-set selected state
mapinfowindow_select_state(g_MapInfoWindow.nCurrentStateID, gtk_label_get_label(g_MapInfoWindow.pStateLabel));
@@ -332,7 +332,7 @@
//
// City
//
-static void mapinfowindow_on_city_button_clicked(GtkWidget* _unused, gpointer __unused)
+static void mapinfowindow_on_city_button_clicked(GtkWidget* _unused, gpointer unused)
{
if(g_MapInfoWindow.nCurrentCityID != 0) {
g_debug("recentering on cityID %d", g_MapInfoWindow.nCurrentCityID);
Index: scenemanager.c
===================================================================
RCS file: /cvs/cairo/roadster/src/scenemanager.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- scenemanager.c 26 Oct 2005 05:04:53 -0000 1.17
+++ scenemanager.c 8 Sep 2007 09:31:53 -0000 1.18
@@ -50,7 +50,7 @@
pSceneManager->nWindowHeight = nWindowHeight;
}
-gboolean scenemanager_can_draw_label_at(scenemanager_t* pSceneManager, const gchar* pszLabel, GdkPoint* __unused_pScreenLocation, gint nFlags)
+gboolean scenemanager_can_draw_label_at(scenemanager_t* pSceneManager, const gchar* pszLabel, GdkPoint* unused_pScreenLocation, gint nFlags)
{
#ifdef ENABLE_NO_DUPLICATE_LABELS
g_assert(pSceneManager != NULL);
Index: tooltipwindow.c
===================================================================
RCS file: /cvs/cairo/roadster/src/tooltipwindow.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- tooltipwindow.c 26 Oct 2005 06:53:23 -0000 1.3
+++ tooltipwindow.c 8 Sep 2007 09:31:53 -0000 1.4
@@ -86,7 +86,7 @@
gtk_widget_hide(GTK_WIDGET(pTooltip->pWindow));
}
-static gboolean tooltip_on_mouse_motion(GtkWidget* pWidget, GdkEventMotion *__unused)
+static gboolean tooltip_on_mouse_motion(GtkWidget* pWidget, GdkEventMotion *unused)
{
// in case the mouse makes its way onto the tooltip, hide it.
gtk_widget_hide(pWidget);
More information about the cairo-commit
mailing list