debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix shadow and missing initialisation warnings

Browse source
This commit is contained in:
Christian Dywan 2011-03-08 19:56:48 +01:00
parent f237c30e06
commit d16b32e6c8
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
midori/midori-browser.c
View file

@ -4827,8 +4827,8 @@ static void
midori_browser_switch_tab_cb (GtkWidget* menuitem, midori_browser_switch_tab_cb (GtkWidget* menuitem,
MidoriBrowser* browser) MidoriBrowser* browser)
{ {
gint index = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (menuitem), "index")); gint page = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (menuitem), "index"));
midori_browser_set_current_page (browser, index); midori_browser_set_current_page (browser, page);
} }
static gboolean static gboolean
@ -4856,7 +4856,7 @@ midori_browser_notebook_button_press_event_after_cb (GtkNotebook* notebook,
GList* tabs = gtk_container_get_children (GTK_CONTAINER (notebook)); GList* tabs = gtk_container_get_children (GTK_CONTAINER (notebook));
GtkWidget* menuitem = sokoke_action_create_popup_menu_item ( GtkWidget* menuitem = sokoke_action_create_popup_menu_item (
gtk_action_group_get_action (browser->action_group, "TabNew")); gtk_action_group_get_action (browser->action_group, "TabNew"));
gint i; gint i = 0;
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
menuitem = sokoke_action_create_popup_menu_item ( menuitem = sokoke_action_create_popup_menu_item (
gtk_action_group_get_action (browser->action_group, "UndoTabClose")); gtk_action_group_get_action (browser->action_group, "UndoTabClose"));

12
toolbars/midori-transferbar.c
View file

@ -82,7 +82,7 @@ midori_transferbar_download_notify_progress_cb (WebKitDownload* download,
gchar* transfer; gchar* transfer;
gdouble* last_time; gdouble* last_time;
guint64* last_size; guint64* last_size;
gdouble time; gdouble timestamp;
guint64 size; guint64 size;
gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progress), gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progress),
@ -92,18 +92,18 @@ midori_transferbar_download_notify_progress_cb (WebKitDownload* download,
total = g_format_size_for_display (webkit_download_get_total_size (download)); total = g_format_size_for_display (webkit_download_get_total_size (download));
last_time = g_object_get_data (G_OBJECT (download), "last-time"); last_time = g_object_get_data (G_OBJECT (download), "last-time");
last_size = g_object_get_data (G_OBJECT (download), "last-size"); last_size = g_object_get_data (G_OBJECT (download), "last-size");
time = webkit_download_get_elapsed_time (download); timestamp = webkit_download_get_elapsed_time (download);
size = webkit_download_get_current_size (download); size = webkit_download_get_current_size (download);
if (time != *last_time) if (timestamp != *last_time)
transfer = g_format_size_for_display ((size - *last_size) / (time - *last_time)); transfer = g_format_size_for_display ((size - *last_size) / (timestamp - *last_time));
else else
/* i18n: Unknown number of bytes, used for transfer rate like ?B/s */ /* i18n: Unknown number of bytes, used for transfer rate like ?B/s */
transfer = g_strdup (_("?B")); transfer = g_strdup (_("?B"));
/* i18n: Download tooltip, 4KB of 43MB, 130KB/s */ /* i18n: Download tooltip, 4KB of 43MB, 130KB/s */
size_text = g_strdup_printf (_("%s of %s, %s/s"), current, total, transfer); size_text = g_strdup_printf (_("%s of %s, %s/s"), current, total, transfer);
if (time - *last_time > 5.0) if (timestamp - *last_time > 5.0)
{ {
*last_time = time; *last_time = timestamp;
*last_size = size; *last_size = size;
} }
g_free (current); g_free (current);