Commit 79f4910c authored by Manish Singh's avatar Manish Singh

corrected 2 annoyances: that stupid hash table == NULL warning and the

* app/gdisplay.c: corrected 2 annoyances: that stupid hash table == NULL
warning and the pointer in the title bar instead of the ID

* app/internal_procs.c: we're registering more procs, so make update the total
proc count

-Yosh
parent 7422ae2e
Mon Aug 10 14:48:20 PDT 1998 Manish Singh <yosh@gimp.org>
* app/gdisplay.c: corrected 2 annoyances: that stupid hash table
== NULL warning and the pointer in the title bar instead of the
ID
* app/internal_procs.c: we're registering more procs, so make update
the total proc count
Mon Aug 10 16:20:33 MEST 1998 Sven Neumann <sven@gimp.org>
* app/internal_procs.c
......
......@@ -178,9 +178,9 @@ gdisplay_format_title (GimpImage *gimage,
image_type_str = NULL;
}
g_snprintf (title, MAX_TITLE_BUF, "%s" "-%p" ".%d (%s)",
g_snprintf (title, MAX_TITLE_BUF, "%s-%d.%d (%s)",
prune_filename (gimage_filename (gimage)),
gimage,
pdb_image_to_id (gimage),
gimage->instance_count,
image_type_str);
}
......@@ -1197,7 +1197,7 @@ gdisplay_active ()
GtkWidget *event_widget;
GtkWidget *toplevel_widget;
GdkEvent *event;
GDisplay *gdisp;
GDisplay *gdisp = NULL;
/* If the popup shell is valid, then get the gdisplay associated with that shell */
event = gtk_get_current_event ();
......@@ -1208,7 +1208,9 @@ gdisplay_active ()
return NULL;
toplevel_widget = gtk_widget_get_toplevel (event_widget);
gdisp = g_hash_table_lookup (display_ht, toplevel_widget);
if (display_ht)
gdisp = g_hash_table_lookup (display_ht, toplevel_widget);
if (gdisp)
return gdisp;
......
......@@ -178,9 +178,9 @@ gdisplay_format_title (GimpImage *gimage,
image_type_str = NULL;
}
g_snprintf (title, MAX_TITLE_BUF, "%s" "-%p" ".%d (%s)",
g_snprintf (title, MAX_TITLE_BUF, "%s-%d.%d (%s)",
prune_filename (gimage_filename (gimage)),
gimage,
pdb_image_to_id (gimage),
gimage->instance_count,
image_type_str);
}
......@@ -1197,7 +1197,7 @@ gdisplay_active ()
GtkWidget *event_widget;
GtkWidget *toplevel_widget;
GdkEvent *event;
GDisplay *gdisp;
GDisplay *gdisp = NULL;
/* If the popup shell is valid, then get the gdisplay associated with that shell */
event = gtk_get_current_event ();
......@@ -1208,7 +1208,9 @@ gdisplay_active ()
return NULL;
toplevel_widget = gtk_widget_get_toplevel (event_widget);
gdisp = g_hash_table_lookup (display_ht, toplevel_widget);
if (display_ht)
gdisp = g_hash_table_lookup (display_ht, toplevel_widget);
if (gdisp)
return gdisp;
......
......@@ -178,9 +178,9 @@ gdisplay_format_title (GimpImage *gimage,
image_type_str = NULL;
}
g_snprintf (title, MAX_TITLE_BUF, "%s" "-%p" ".%d (%s)",
g_snprintf (title, MAX_TITLE_BUF, "%s-%d.%d (%s)",
prune_filename (gimage_filename (gimage)),
gimage,
pdb_image_to_id (gimage),
gimage->instance_count,
image_type_str);
}
......@@ -1197,7 +1197,7 @@ gdisplay_active ()
GtkWidget *event_widget;
GtkWidget *toplevel_widget;
GdkEvent *event;
GDisplay *gdisp;
GDisplay *gdisp = NULL;
/* If the popup shell is valid, then get the gdisplay associated with that shell */
event = gtk_get_current_event ();
......@@ -1208,7 +1208,9 @@ gdisplay_active ()
return NULL;
toplevel_widget = gtk_widget_get_toplevel (event_widget);
gdisp = g_hash_table_lookup (display_ht, toplevel_widget);
if (display_ht)
gdisp = g_hash_table_lookup (display_ht, toplevel_widget);
if (gdisp)
return gdisp;
......
......@@ -77,7 +77,7 @@ internal_procs_init ()
{
gfloat pcount = 0;
/* grep -c procedural_db_register internal_procs.c */
gfloat total_pcount = 204;
gfloat total_pcount = 206;
app_init_update_status("Internal Procedures", "Tool procedures",
pcount/total_pcount);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment