Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
726fbda1
Commit
726fbda1
authored
Sep 18, 2012
by
Tristan Matthews
Browse files
Options
Downloads
Patches
Plain Diff
* #15717: gnome: remove "start-hidden" option
Checking it meant that the GUI would stay permanently invisible.
parent
b7cd213e
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
gnome/data/org.sflphone.SFLphone.gschema.xml
+0
-5
0 additions, 5 deletions
gnome/data/org.sflphone.SFLphone.gschema.xml
gnome/src/config/preferencesdialog.c
+0
-19
0 additions, 19 deletions
gnome/src/config/preferencesdialog.c
gnome/src/main.c
+0
-5
0 additions, 5 deletions
gnome/src/main.c
with
0 additions
and
29 deletions
gnome/data/org.sflphone.SFLphone.gschema.xml
+
0
−
5
View file @
726fbda1
...
@@ -45,11 +45,6 @@
...
@@ -45,11 +45,6 @@
<summary>
Instant messaging is enabled
</summary>
<summary>
Instant messaging is enabled
</summary>
<description>
Instant messaging is enabled.
</description>
<description>
Instant messaging is enabled.
</description>
</key>
</key>
<key
name=
"start-hidden"
type=
"b"
>
<default>
false
</default>
<summary>
Start hidden
</summary>
<description>
Start hidden.
</description>
</key>
<key
name=
"message-tab-height"
type=
"i"
>
<key
name=
"message-tab-height"
type=
"i"
>
<default>
20
</default>
<default>
20
</default>
<summary>
Message tab height
</summary>
<summary>
Message tab height
</summary>
...
...
This diff is collapsed.
Click to expand it.
gnome/src/config/preferencesdialog.c
+
0
−
19
View file @
726fbda1
...
@@ -65,7 +65,6 @@
...
@@ -65,7 +65,6 @@
*/
*/
static
GtkWidget
*
history_value
;
static
GtkWidget
*
history_value
;
static
GtkWidget
*
starthidden
;
static
GtkWidget
*
popupwindow
;
static
GtkWidget
*
popupwindow
;
static
GtkWidget
*
neverpopupwindow
;
static
GtkWidget
*
neverpopupwindow
;
...
@@ -85,13 +84,6 @@ static gboolean history_enabled = TRUE;
...
@@ -85,13 +84,6 @@ static gboolean history_enabled = TRUE;
// instant messaging preference parameters
// instant messaging preference parameters
static
gboolean
instant_messaging_enabled
=
TRUE
;
static
gboolean
instant_messaging_enabled
=
TRUE
;
static
void
start_hidden
(
GtkWidget
*
widget
UNUSED
,
GSettings
*
settings
)
{
const
gboolean
currentstate
=
g_settings_get_boolean
(
settings
,
"start-hidden"
);
g_settings_set_boolean
(
settings
,
"start-hidden"
,
!
currentstate
);
}
static
void
static
void
set_popup_mode
(
GtkToggleButton
*
widget
,
GSettings
*
settings
)
set_popup_mode
(
GtkToggleButton
*
widget
,
GSettings
*
settings
)
{
{
...
@@ -139,7 +131,6 @@ void showstatusicon_cb(GtkToggleButton *widget, GSettings *settings)
...
@@ -139,7 +131,6 @@ void showstatusicon_cb(GtkToggleButton *widget, GSettings *settings)
// Update the widget states
// Update the widget states
gtk_widget_set_sensitive
(
GTK_WIDGET
(
popupwindow
),
currentstatus
);
gtk_widget_set_sensitive
(
GTK_WIDGET
(
popupwindow
),
currentstatus
);
gtk_widget_set_sensitive
(
GTK_WIDGET
(
neverpopupwindow
),
currentstatus
);
gtk_widget_set_sensitive
(
GTK_WIDGET
(
neverpopupwindow
),
currentstatus
);
gtk_widget_set_sensitive
(
GTK_WIDGET
(
starthidden
),
currentstatus
);
currentstatus
?
show_status_icon
(
settings
)
:
hide_status_icon
();
currentstatus
?
show_status_icon
(
settings
)
:
hide_status_icon
();
...
@@ -222,19 +213,9 @@ create_general_settings(GSettings *settings)
...
@@ -222,19 +213,9 @@ create_general_settings(GSettings *settings)
GTK_TOGGLE_BUTTON
(
neverpopupwindow
),
GTK_TOGGLE_BUTTON
(
neverpopupwindow
),
TRUE
);
TRUE
);
starthidden
=
gtk_check_button_new_with_mnemonic
(
_
(
"Hide SFLphone window on _startup"
));
gtk_toggle_button_set_active
(
GTK_TOGGLE_BUTTON
(
starthidden
),
g_settings_get_boolean
(
settings
,
"start-hidden"
));
g_signal_connect
(
G_OBJECT
(
starthidden
)
,
"clicked"
,
G_CALLBACK
(
start_hidden
),
settings
);
gtk_table_attach
(
GTK_TABLE
(
table
),
starthidden
,
0
,
1
,
3
,
4
,
GTK_EXPAND
|
GTK_FILL
,
GTK_EXPAND
|
GTK_FILL
,
0
,
5
);
// Update the widget states
// Update the widget states
gtk_widget_set_sensitive
(
GTK_WIDGET
(
popupwindow
),
statusicon
);
gtk_widget_set_sensitive
(
GTK_WIDGET
(
popupwindow
),
statusicon
);
gtk_widget_set_sensitive
(
GTK_WIDGET
(
neverpopupwindow
),
statusicon
);
gtk_widget_set_sensitive
(
GTK_WIDGET
(
neverpopupwindow
),
statusicon
);
gtk_widget_set_sensitive
(
GTK_WIDGET
(
starthidden
),
statusicon
);
// HISTORY CONFIGURATION
// HISTORY CONFIGURATION
gnome_main_section_new_with_table
(
_
(
"Calls History"
),
&
frame
,
&
table
,
3
,
1
);
gnome_main_section_new_with_table
(
_
(
"Calls History"
),
&
frame
,
&
table
,
3
,
1
);
...
...
This diff is collapsed.
Click to expand it.
gnome/src/main.c
+
0
−
5
View file @
726fbda1
...
@@ -142,11 +142,6 @@ main(int argc, char *argv[])
...
@@ -142,11 +142,6 @@ main(int argc, char *argv[])
create_main_window
(
settings
);
create_main_window
(
settings
);
if
(
show_status
&&
g_settings_get_boolean
(
settings
,
"start-hidden"
))
{
gtk_widget_hide
(
GTK_WIDGET
(
get_main_window
()));
set_minimized
(
TRUE
);
}
status_bar_display_account
();
status_bar_display_account
();
sflphone_fill_history_lazy
();
sflphone_fill_history_lazy
();
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment